【代码优化】IoT: 场景联动

yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java

@@ -72,8 +72,8 @@ public interface ErrorCodeConstants {
     // ========== IoT 数据桥梁 1-050-010-000 ==========
     ErrorCode DATA_BRIDGE_NOT_EXISTS = new ErrorCode(1_050_010_000, "IoT 数据桥梁不存在");
 
-    // ========== IoT 规则场景（场景联动） 1-050-011-000 ==========
+    // ========== IoT 场景联动 1-050-011-000 ==========
-    ErrorCode RULE_SCENE_NOT_EXISTS = new ErrorCode(1_050_011_000, "IoT 规则场景（场景联动）不存在");
+    ErrorCode RULE_SCENE_NOT_EXISTS = new ErrorCode(1_050_011_000, "IoT 场景联动不存在");
 
     // ========== IoT 产品脚本信息 1-050-012-000 ==========
     ErrorCode PRODUCT_SCRIPT_NOT_EXISTS = new ErrorCode(1_050_012_000, "IoT 产品脚本信息不存在");

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotRuleSceneController.java

@@ -20,8 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-// TODO @芋艿：规则场景 要不要，统一改成 场景联动
+@Tag(name = "管理后台 - IoT 场景联动")
-@Tag(name = "管理后台 - IoT 规则场景")
 @RestController
 @RequestMapping("/iot/rule-scene")
 @Validated
@@ -31,14 +30,14 @@ public class IotRuleSceneController {
     private IotRuleSceneService ruleSceneService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建规则场景（场景联动）")
+    @Operation(summary = "创建场景联动")
     @PreAuthorize("@ss.hasPermission('iot:rule-scene:create')")
     public CommonResult<Long> createRuleScene(@Valid @RequestBody IotRuleSceneSaveReqVO createReqVO) {
         return success(ruleSceneService.createRuleScene(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新规则场景（场景联动）")
+    @Operation(summary = "更新场景联动")
     @PreAuthorize("@ss.hasPermission('iot:rule-scene:update')")
     public CommonResult<Boolean> updateRuleScene(@Valid @RequestBody IotRuleSceneSaveReqVO updateReqVO) {
         ruleSceneService.updateRuleScene(updateReqVO);
@@ -46,7 +45,7 @@ public class IotRuleSceneController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除规则场景（场景联动）")
+    @Operation(summary = "删除场景联动")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('iot:rule-scene:delete')")
     public CommonResult<Boolean> deleteRuleScene(@RequestParam("id") Long id) {
@@ -55,7 +54,7 @@ public class IotRuleSceneController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得规则场景（场景联动）")
+    @Operation(summary = "获得场景联动")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iot:rule-scene:query')")
     public CommonResult<IotRuleSceneRespVO> getRuleScene(@RequestParam("id") Long id) {
@@ -64,7 +63,7 @@ public class IotRuleSceneController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得规则场景（场景联动）分页")
+    @Operation(summary = "获得场景联动分页")
     @PreAuthorize("@ss.hasPermission('iot:rule-scene:query')")
     public CommonResult<PageResult<IotRuleSceneRespVO>> getRuleScenePage(@Valid IotRuleScenePageReqVO pageReqVO) {
         PageResult<IotRuleSceneDO> pageResult = ruleSceneService.getRuleScenePage(pageReqVO);

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/package-info.java

@@ -1,2 +0,0 @@
-// TODO @芋艿：占位
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/IotRuleScenePageReqVO.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - IoT 规则场景（场景联动）分页 Request VO")
+@Schema(description = "管理后台 - IoT 场景联动分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/IotRuleSceneRespVO.java

@@ -1,14 +1,13 @@
 package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene;
 
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneTriggerConfig;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Schema(description = "管理后台 - IoT 规则场景（场景联动） Response VO")
+@Schema(description = "管理后台 - IoT 场景联动 Response VO")
 @Data
 public class IotRuleSceneRespVO {
 
@@ -25,10 +24,10 @@ public class IotRuleSceneRespVO {
     private Integer status;
 
     @Schema(description = "触发器数组", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<IotRuleSceneTriggerConfig> triggers;
+    private List<IotRuleSceneDO.TriggerConfig> triggers;
 
     @Schema(description = "执行器数组", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<IotRuleSceneActionConfig> actions;
+    private List<IotRuleSceneDO.ActionConfig> actions;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/IotRuleSceneSaveReqVO.java

@@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneTriggerConfig;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -11,7 +10,7 @@ import lombok.Data;
 
 import java.util.List;
 
-@Schema(description = "管理后台 - IoT 规则场景（场景联动）新增/修改 Request VO")
+@Schema(description = "管理后台 - IoT 场景联动新增/修改 Request VO")
 @Data
 public class IotRuleSceneSaveReqVO {
 
@@ -32,10 +31,10 @@ public class IotRuleSceneSaveReqVO {
 
     @Schema(description = "触发器数组", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "触发器数组不能为空")
-    private List<IotRuleSceneTriggerConfig> triggers;
+    private List<IotRuleSceneDO.TriggerConfig> triggers;
 
     @Schema(description = "执行器数组", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "执行器数组不能为空")
-    private List<IotRuleSceneActionConfig> actions;
+    private List<IotRuleSceneDO.ActionConfig> actions;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/config/IotRuleSceneActionConfig.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
-import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
-import lombok.Data;
-
-// TODO @puhui999：这个要不内嵌到 IoTRuleSceneDO 里面？
-/**
- * 执行器配置
- *
- * @author 芋道源码
- */
-@Data
-public class IotRuleSceneActionConfig {
-
-    /**
-     * 执行类型
-     *
-     * 枚举 {@link IotRuleSceneActionTypeEnum}
-     */
-    private Integer type;
-
-    /**
-     * 设备控制
-     *
-     * 必填：当 {@link #type} 为 {@link IotRuleSceneActionTypeEnum#DEVICE_CONTROL} 时
-     */
-    private IotRuleSceneActionDeviceControl deviceControl;
-
-    /**
-     * 数据桥接编号
-     *
-     * 必填：当 {@link #type} 为 {@link IotRuleSceneActionTypeEnum#DATA_BRIDGE} 时
-     * 关联：{@link IotDataBridgeDO#getId()}
-     */
-    private Long dataBridgeId;
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/config/IotRuleSceneActionDeviceControl.java

@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageIdentifierEnum;
-import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageTypeEnum;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-// TODO @puhui999：这个要不内嵌到 IoTRuleSceneDO 里面？
-/**
- * 执行设备控制
- *
- * @author 芋道源码
- */
-@Data
-public class IotRuleSceneActionDeviceControl {
-
-    /**
-     * 产品标识
-     *
-     * 关联 {@link IotProductDO#getProductKey()}
-     */
-    private String productKey;
-    /**
-     * 设备名称数组
-     *
-     * 关联 {@link IotDeviceDO#getDeviceName()}
-     */
-    private List<String> deviceNames;
-
-    /**
-     * 消息类型
-     *
-     * 枚举 {@link IotDeviceMessageTypeEnum#PROPERTY}、{@link IotDeviceMessageTypeEnum#SERVICE}
-     */
-    private String type;
-    /**
-     * 消息标识符
-     *
-     * 枚举 {@link IotDeviceMessageIdentifierEnum}
-     *
-     * 1. 属性设置：对应 {@link IotDeviceMessageIdentifierEnum#PROPERTY_SET}
-     * 2. 服务调用：对应 {@link IotDeviceMessageIdentifierEnum#SERVICE_INVOKE}
-     */
-    private String identifier;
-
-    /**
-     * 具体数据
-     *
-     * 1. 属性设置：在 {@link #type} 是 {@link IotDeviceMessageTypeEnum#PROPERTY} 时，对应 properties
-     * 2. 服务调用：在 {@link #type} 是 {@link IotDeviceMessageTypeEnum#SERVICE} 时，对应 params
-     */
-    private Map<String, Object> data;
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/config/IotRuleSceneTriggerCondition.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config;
-
-import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageIdentifierEnum;
-import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageTypeEnum;
-import lombok.Data;
-
-import java.util.List;
-
-// TODO @puhui999：这个要不内嵌到 IoTRuleSceneDO 里面？
-/**
- * 触发条件
- *
- * @author 芋道源码
- */
-@Data
-public class IotRuleSceneTriggerCondition {
-
-    /**
-     * 消息类型
-     *
-     * 枚举 {@link IotDeviceMessageTypeEnum}
-     */
-    private String type;
-    /**
-     * 消息标识符
-     *
-     * 枚举 {@link IotDeviceMessageIdentifierEnum}
-     */
-    private String identifier;
-
-    /**
-     * 参数数组
-     *
-     * 参数与参数之间，是“或”的关系
-     */
-    private List<IotRuleSceneTriggerConditionParameter> parameters;
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/config/IotRuleSceneTriggerConditionParameter.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
-import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneTriggerConditionParameterOperatorEnum;
-import lombok.Data;
-
-// TODO @puhui999：这个要不内嵌到 IoTRuleSceneDO 里面？
-/**
- * 触发条件参数
- *
- * @author 芋道源码
- */
-@Data
-public class IotRuleSceneTriggerConditionParameter {
-
-    /**
-     * 标识符（属性、事件、服务）
-     *
-     * 关联 {@link IotThingModelDO#getIdentifier()}
-     */
-    private String identifier;
-
-    /**
-     * 操作符
-     *
-     * 枚举 {@link IotRuleSceneTriggerConditionParameterOperatorEnum}
-     */
-    private String operator;
-
-    /**
-     * 比较值
-     *
-     * 如果有多个值，则使用 "," 分隔，类似 "1,2,3"。
-     * 例如说，{@link IotRuleSceneTriggerConditionParameterOperatorEnum#IN}、{@link IotRuleSceneTriggerConditionParameterOperatorEnum#BETWEEN}
-     */
-    private String value;
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/scene/config/IotRuleSceneTriggerConfig.java

@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneTriggerTypeEnum;
-import lombok.Data;
-
-import java.util.List;
-
-// TODO @puhui999：这个要不内嵌到 IoTRuleSceneDO 里面？
-/**
- * 触发器配置
- *
- * @author 芋道源码
- */
-@Data
-public class IotRuleSceneTriggerConfig {
-
-    /**
-     * 触发类型
-     *
-     * 枚举 {@link IotRuleSceneTriggerTypeEnum}
-     */
-    private Integer type;
-
-    /**
-     * 产品标识
-     *
-     * 关联 {@link IotProductDO#getProductKey()}
-     */
-    private String productKey;
-    /**
-     * 设备名称数组
-     *
-     * 关联 {@link IotDeviceDO#getDeviceName()}
-     */
-    private List<String> deviceNames;
-
-    /**
-     * 触发条件数组
-     *
-     * 必填：当 {@link #type} 为 {@link IotRuleSceneTriggerTypeEnum#DEVICE} 时
-     * 条件与条件之间，是“或”的关系
-     */
-    private List<IotRuleSceneTriggerCondition> conditions;
-
-    /**
-     * CRON 表达式
-     *
-     * 必填：当 {@link #type} 为 {@link IotRuleSceneTriggerTypeEnum#TIMER} 时
-     */
-    private String cronExpression;
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/IotThingModelController.java

@@ -1,10 +1,13 @@
 package cn.iocoder.yudao.module.iot.controller.admin.thingmodel;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.*;
 import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotThingModelTypeEnum;
 import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -18,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
 
 @Tag(name = "管理后台 - IoT 产品物模型")
 @RestController
@@ -61,13 +66,31 @@ public class IotThingModelController {
         return success(BeanUtils.toBean(thingModel, IotThingModelRespVO.class));
     }
 
-    // TODO @puhui999：要不叫 get-tsl，去掉 product-id；后续，把
+    @GetMapping("/get-tsl")
-    @GetMapping("/tsl-by-product-id")
     @Operation(summary = "获得产品物模型 TSL")
     @Parameter(name = "productId", description = "产品 ID", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iot:thing-model:query')")
-    public CommonResult<IotThingModelTSLRespVO> getThingModelTslByProductId(@RequestParam("productId") Long productId) {
+    public CommonResult<IotThingModelTSLRespVO> getThingModelTsl(@RequestParam("productId") Long productId) {
-        return success(thingModelService.getThingModelTslByProductId(productId));
+        IotThingModelTSLRespVO tslRespVO = new IotThingModelTSLRespVO();
+        // 1. 获得产品所有物模型定义
+        List<IotThingModelDO> thingModels = thingModelService.getThingModelListByProductId(productId);
+        if (CollUtil.isEmpty(thingModels)) {
+            return success(tslRespVO);
+        }
+
+        // 2.1 设置公共部分参数
+        IotThingModelDO thingModel = thingModels.get(0);
+        tslRespVO.setProductId(thingModel.getProductId()).setProductKey(thingModel.getProductKey());
+        // 2.2 处理属性列表
+        tslRespVO.setProperties(convertList(filterList(thingModels, item ->
+                ObjUtil.equal(IotThingModelTypeEnum.PROPERTY.getType(), item.getType())), IotThingModelDO::getProperty));
+        // 2.3 处理服务列表
+        tslRespVO.setServices(convertList(filterList(thingModels, item ->
+                ObjUtil.equal(IotThingModelTypeEnum.SERVICE.getType(), item.getType())), IotThingModelDO::getService));
+        // 2.4 处理事件列表
+        tslRespVO.setEvents(convertList(filterList(thingModels, item ->
+                ObjUtil.equal(IotThingModelTypeEnum.EVENT.getType(), item.getType())), IotThingModelDO::getEvent));
+        return success(tslRespVO);
     }
 
     @GetMapping("/list")

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/rule/IotRuleSceneDO.java

@@ -1,8 +1,14 @@
 package cn.iocoder.yudao.module.iot.dal.dataobject.rule;
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneTriggerConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
+import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageIdentifierEnum;
+import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneTriggerConditionParameterOperatorEnum;
+import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneTriggerTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,13 +20,14 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * IoT 规则场景（场景联动） DO
+ * IoT 场景联动 DO
  *
  * @author 芋道源码
  */
-@TableName("iot_rule_scene")
+@TableName(value = "iot_rule_scene", autoResultMap = true)
 @KeySequence("iot_rule_scene_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @Builder
@@ -52,12 +59,188 @@ public class IotRuleSceneDO extends TenantBaseDO {
      * 触发器数组
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<IotRuleSceneTriggerConfig> triggers;
+    private List<TriggerConfig> triggers;
 
     /**
      * 执行器数组
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<IotRuleSceneActionConfig> actions;
+    private List<ActionConfig> actions;
+
+    /**
+     * 触发器配置
+     */
+    @Data
+    public static class TriggerConfig {
+
+        /**
+         * 触发类型
+         *
+         * 枚举 {@link IotRuleSceneTriggerTypeEnum}
+         */
+        private Integer type;
+
+        /**
+         * 产品标识
+         *
+         * 关联 {@link IotProductDO#getProductKey()}
+         */
+        private String productKey;
+        /**
+         * 设备名称数组
+         *
+         * 关联 {@link IotDeviceDO#getDeviceName()}
+         */
+        private List<String> deviceNames;
+
+        /**
+         * 触发条件数组
+         *
+         * 必填：当 {@link #type} 为 {@link IotRuleSceneTriggerTypeEnum#DEVICE} 时
+         * 条件与条件之间，是“或”的关系
+         */
+        private List<TriggerCondition> conditions;
+
+        /**
+         * CRON 表达式
+         *
+         * 必填：当 {@link #type} 为 {@link IotRuleSceneTriggerTypeEnum#TIMER} 时
+         */
+        private String cronExpression;
+
+    }
+
+    /**
+     * 触发条件
+     */
+    @Data
+    public static class TriggerCondition {
+
+        /**
+         * 消息类型
+         *
+         * 枚举 {@link IotDeviceMessageTypeEnum}
+         */
+        private String type;
+        /**
+         * 消息标识符
+         *
+         * 枚举 {@link IotDeviceMessageIdentifierEnum}
+         */
+        private String identifier;
+
+        /**
+         * 参数数组
+         *
+         * 参数与参数之间，是“或”的关系
+         */
+        private List<TriggerConditionParameter> parameters;
+
+    }
+
+    /**
+     * 触发条件参数
+     */
+    @Data
+    public static class TriggerConditionParameter {
+
+        /**
+         * 标识符（属性、事件、服务）
+         *
+         * 关联 {@link IotThingModelDO#getIdentifier()}
+         */
+        private String identifier;
+
+        /**
+         * 操作符
+         *
+         * 枚举 {@link IotRuleSceneTriggerConditionParameterOperatorEnum}
+         */
+        private String operator;
+
+        /**
+         * 比较值
+         *
+         * 如果有多个值，则使用 "," 分隔，类似 "1,2,3"。
+         * 例如说，{@link IotRuleSceneTriggerConditionParameterOperatorEnum#IN}、{@link IotRuleSceneTriggerConditionParameterOperatorEnum#BETWEEN}
+         */
+        private String value;
+
+    }
+
+    /**
+     * 执行器配置
+     */
+    @Data
+    public static class ActionConfig {
+
+        /**
+         * 执行类型
+         *
+         * 枚举 {@link IotRuleSceneActionTypeEnum}
+         */
+        private Integer type;
+
+        /**
+         * 设备控制
+         *
+         * 必填：当 {@link #type} 为 {@link IotRuleSceneActionTypeEnum#DEVICE_CONTROL} 时
+         */
+        private ActionDeviceControl deviceControl;
+
+        /**
+         * 数据桥接编号
+         *
+         * 必填：当 {@link #type} 为 {@link IotRuleSceneActionTypeEnum#DATA_BRIDGE} 时
+         * 关联：{@link IotDataBridgeDO#getId()}
+         */
+        private Long dataBridgeId;
+
+    }
+
+    /**
+     * 执行设备控制
+     */
+    @Data
+    public static class ActionDeviceControl {
+
+        /**
+         * 产品标识
+         *
+         * 关联 {@link IotProductDO#getProductKey()}
+         */
+        private String productKey;
+        /**
+         * 设备名称数组
+         *
+         * 关联 {@link IotDeviceDO#getDeviceName()}
+         */
+        private List<String> deviceNames;
+
+        /**
+         * 消息类型
+         *
+         * 枚举 {@link IotDeviceMessageTypeEnum#PROPERTY}、{@link IotDeviceMessageTypeEnum#SERVICE}
+         */
+        private String type;
+        /**
+         * 消息标识符
+         *
+         * 枚举 {@link IotDeviceMessageIdentifierEnum}
+         *
+         * 1. 属性设置：对应 {@link IotDeviceMessageIdentifierEnum#PROPERTY_SET}
+         * 2. 服务调用：对应 {@link IotDeviceMessageIdentifierEnum#SERVICE_INVOKE}
+         */
+        private String identifier;
+
+        /**
+         * 具体数据
+         *
+         * 1. 属性设置：在 {@link #type} 是 {@link IotDeviceMessageTypeEnum#PROPERTY} 时，对应 properties
+         * 2. 服务调用：在 {@link #type} 是 {@link IotDeviceMessageTypeEnum#SERVICE} 时，对应 params
+         */
+        private Map<String, Object> data;
+
+    }
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotRuleSceneMapper.java

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * IoT 规则场景（场景联动） Mapper
+ * IoT 场景联动 Mapper
  *
  * @author HUIHUI
  */

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotRuleSceneService.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface IotRuleSceneService {
 
     /**
-     * 创建规则场景（场景联动）
+     * 创建场景联动
      *
      * @param createReqVO 创建信息
      * @return 编号
@@ -26,32 +26,32 @@ public interface IotRuleSceneService {
     Long createRuleScene(@Valid IotRuleSceneSaveReqVO createReqVO);
 
     /**
-     * 更新规则场景（场景联动）
+     * 更新场景联动
      *
      * @param updateReqVO 更新信息
      */
     void updateRuleScene(@Valid IotRuleSceneSaveReqVO updateReqVO);
 
     /**
-     * 删除规则场景（场景联动）
+     * 删除场景联动
      *
      * @param id 编号
      */
     void deleteRuleScene(Long id);
 
     /**
-     * 获得规则场景（场景联动）
+     * 获得场景联动
      *
      * @param id 编号
-     * @return 规则场景（场景联动）
+     * @return 场景联动
      */
     IotRuleSceneDO getRuleScene(Long id);
 
     /**
-     * 获得规则场景（场景联动）分页
+     * 获得场景联动分页
      *
      * @param pageReqVO 分页查询
-     * @return 规则场景（场景联动）分页
+     * @return 场景联动分页
      */
     PageResult<IotRuleSceneDO> getRuleScenePage(IotRuleScenePageReqVO pageReqVO);
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotRuleSceneServiceImpl.java

@@ -17,7 +17,6 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.IotRuleScenePageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.IotRuleSceneSaveReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.*;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import cn.iocoder.yudao.module.iot.dal.mysql.rule.IotRuleSceneMapper;
 import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageIdentifierEnum;
@@ -118,82 +117,82 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
         if (true) {
             IotRuleSceneDO ruleScene01 = new IotRuleSceneDO();
             ruleScene01.setTriggers(CollUtil.newArrayList());
-            IotRuleSceneTriggerConfig trigger01 = new IotRuleSceneTriggerConfig();
+            IotRuleSceneDO.TriggerConfig trigger01 = new IotRuleSceneDO.TriggerConfig();
             trigger01.setType(IotRuleSceneTriggerTypeEnum.DEVICE.getType());
             trigger01.setConditions(CollUtil.newArrayList());
             // 属性
-            IotRuleSceneTriggerCondition condition01 = new IotRuleSceneTriggerCondition();
+            IotRuleSceneDO.TriggerCondition condition01 = new IotRuleSceneDO.TriggerCondition();
             condition01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
             condition01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_REPORT.getIdentifier());
             condition01.setParameters(CollUtil.newArrayList());
-//            IotRuleSceneTriggerConditionParameter parameter010 = new IotRuleSceneTriggerConditionParameter();
+//            IotRuleSceneDO.TriggerConditionParameter parameter010 = new IotRuleSceneDO.TriggerConditionParameter();
 //            parameter010.setIdentifier("width");
 //            parameter010.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
 //            parameter010.setValue("abc");
 //            condition01.getParameters().add(parameter010);
-            IotRuleSceneTriggerConditionParameter parameter011 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter011 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter011.setIdentifier("width");
             parameter011.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
             parameter011.setValue("1");
             condition01.getParameters().add(parameter011);
-            IotRuleSceneTriggerConditionParameter parameter012 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter012 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter012.setIdentifier("width");
             parameter012.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.getOperator());
             parameter012.setValue("2");
             condition01.getParameters().add(parameter012);
-            IotRuleSceneTriggerConditionParameter parameter013 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter013 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter013.setIdentifier("width");
             parameter013.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN.getOperator());
             parameter013.setValue("0");
             condition01.getParameters().add(parameter013);
-            IotRuleSceneTriggerConditionParameter parameter014 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter014 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter014.setIdentifier("width");
             parameter014.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS.getOperator());
             parameter014.setValue("0");
             condition01.getParameters().add(parameter014);
-            IotRuleSceneTriggerConditionParameter parameter015 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter015 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter015.setIdentifier("width");
             parameter015.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN.getOperator());
             parameter015.setValue("2");
             condition01.getParameters().add(parameter015);
-            IotRuleSceneTriggerConditionParameter parameter016 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter016 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter016.setIdentifier("width");
             parameter016.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS.getOperator());
             parameter016.setValue("2");
             condition01.getParameters().add(parameter016);
-            IotRuleSceneTriggerConditionParameter parameter017 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter017 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter017.setIdentifier("width");
             parameter017.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.IN.getOperator());
             parameter017.setValue("1,2,3");
             condition01.getParameters().add(parameter017);
-            IotRuleSceneTriggerConditionParameter parameter018 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter018 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter018.setIdentifier("width");
             parameter018.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_IN.getOperator());
             parameter018.setValue("0,2,3");
             condition01.getParameters().add(parameter018);
-            IotRuleSceneTriggerConditionParameter parameter019 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter019 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter019.setIdentifier("width");
             parameter019.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.BETWEEN.getOperator());
             parameter019.setValue("1,3");
             condition01.getParameters().add(parameter019);
-            IotRuleSceneTriggerConditionParameter parameter020 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter020 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter020.setIdentifier("width");
             parameter020.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_BETWEEN.getOperator());
             parameter020.setValue("2,3");
             condition01.getParameters().add(parameter020);
             trigger01.getConditions().add(condition01);
             // 状态
-            IotRuleSceneTriggerCondition condition02 = new IotRuleSceneTriggerCondition();
+            IotRuleSceneDO.TriggerCondition condition02 = new IotRuleSceneDO.TriggerCondition();
             condition02.setType(IotDeviceMessageTypeEnum.STATE.getType());
             condition02.setIdentifier(IotDeviceMessageIdentifierEnum.STATE_ONLINE.getIdentifier());
             condition02.setParameters(CollUtil.newArrayList());
             trigger01.getConditions().add(condition02);
             // 事件
-            IotRuleSceneTriggerCondition condition03 = new IotRuleSceneTriggerCondition();
+            IotRuleSceneDO.TriggerCondition condition03 = new IotRuleSceneDO.TriggerCondition();
             condition03.setType(IotDeviceMessageTypeEnum.EVENT.getType());
             condition03.setIdentifier("xxx");
             condition03.setParameters(CollUtil.newArrayList());
-            IotRuleSceneTriggerConditionParameter parameter030 = new IotRuleSceneTriggerConditionParameter();
+            IotRuleSceneDO.TriggerConditionParameter parameter030 = new IotRuleSceneDO.TriggerConditionParameter();
             parameter030.setIdentifier("width");
             parameter030.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
             parameter030.setValue("1");
@@ -202,21 +201,21 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
             // 动作
             ruleScene01.setActions(CollUtil.newArrayList());
             // 设备控制
-            IotRuleSceneActionConfig action01 = new IotRuleSceneActionConfig();
+            IotRuleSceneDO.ActionConfig action01 = new IotRuleSceneDO.ActionConfig();
             action01.setType(IotRuleSceneActionTypeEnum.DEVICE_CONTROL.getType());
-            IotRuleSceneActionDeviceControl iotRuleSceneActionDeviceControl01 = new IotRuleSceneActionDeviceControl();
+            IotRuleSceneDO.ActionDeviceControl actionDeviceControl01 = new IotRuleSceneDO.ActionDeviceControl();
-            iotRuleSceneActionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
+            actionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
-            iotRuleSceneActionDeviceControl01.setDeviceNames(ListUtil.of("small"));
+            actionDeviceControl01.setDeviceNames(ListUtil.of("small"));
-            iotRuleSceneActionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
+            actionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
-            iotRuleSceneActionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
+            actionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
-            iotRuleSceneActionDeviceControl01.setData(MapUtil.<String, Object>builder()
+            actionDeviceControl01.setData(MapUtil.<String, Object>builder()
                     .put("power", 1)
                     .put("color", "red")
                     .build());
-            action01.setDeviceControl(iotRuleSceneActionDeviceControl01);
+            action01.setDeviceControl(actionDeviceControl01);
 //            ruleScene01.getActions().add(action01); // TODO 芋艿：先不测试了
             // 数据桥接（http）
-            IotRuleSceneActionConfig action02 = new IotRuleSceneActionConfig();
+            IotRuleSceneDO.ActionConfig action02 = new IotRuleSceneDO.ActionConfig();
             action02.setType(IotRuleSceneActionTypeEnum.DATA_BRIDGE.getType());
             action02.setDataBridgeId(1L);
             ruleScene01.getActions().add(action02);
@@ -226,7 +225,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
         List<IotRuleSceneDO> list = ruleSceneMapper.selectList();
         // TODO @芋艿：需要考虑开启状态
         return filterList(list, ruleScene -> {
-            for (IotRuleSceneTriggerConfig trigger : ruleScene.getTriggers()) {
+            for (IotRuleSceneDO.TriggerConfig trigger : ruleScene.getTriggers()) {
                 if (ObjUtil.notEqual(trigger.getProductKey(), productKey)) {
                     continue;
                 }
@@ -261,13 +260,13 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
         IotRuleSceneDO scene = new IotRuleSceneDO().setStatus(CommonStatusEnum.ENABLE.getStatus());
         if (true) {
             scene.setTenantId(1L);
-            IotRuleSceneTriggerConfig iotRuleSceneTriggerConfig = new IotRuleSceneTriggerConfig();
+            IotRuleSceneDO.TriggerConfig triggerConfig = new IotRuleSceneDO.TriggerConfig();
-            iotRuleSceneTriggerConfig.setType(IotRuleSceneTriggerTypeEnum.TIMER.getType());
+            triggerConfig.setType(IotRuleSceneTriggerTypeEnum.TIMER.getType());
-            scene.setTriggers(ListUtil.toList(iotRuleSceneTriggerConfig));
+            scene.setTriggers(ListUtil.toList(triggerConfig));
             // 动作
-            IotRuleSceneActionConfig action01 = new IotRuleSceneActionConfig();
+            IotRuleSceneDO.ActionConfig action01 = new IotRuleSceneDO.ActionConfig();
             action01.setType(IotRuleSceneActionTypeEnum.DEVICE_CONTROL.getType());
-            IotRuleSceneActionDeviceControl iotRuleSceneActionDeviceControl01 = new IotRuleSceneActionDeviceControl();
+            IotRuleSceneDO.ActionDeviceControl iotRuleSceneActionDeviceControl01 = new IotRuleSceneDO.ActionDeviceControl();
             iotRuleSceneActionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
             iotRuleSceneActionDeviceControl01.setDeviceNames(ListUtil.of("small"));
             iotRuleSceneActionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
@@ -288,7 +287,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
             return;
         }
         // 1.2 判断是否有定时触发器，避免脏数据
-        IotRuleSceneTriggerConfig config = CollUtil.findOne(scene.getTriggers(),
+        IotRuleSceneDO.TriggerConfig config = CollUtil.findOne(scene.getTriggers(),
                 trigger -> ObjUtil.equals(trigger.getType(), IotRuleSceneTriggerTypeEnum.TIMER.getType()));
         if (config == null) {
             log.error("[executeRuleSceneByTimer][规则场景({}) 不存在定时触发器]", scene);
@@ -317,7 +316,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
 
         // 2. 匹配 trigger 触发器的条件
         return filterList(ruleScenes, ruleScene -> {
-            for (IotRuleSceneTriggerConfig trigger : ruleScene.getTriggers()) {
+            for (IotRuleSceneDO.TriggerConfig trigger : ruleScene.getTriggers()) {
                 // 2.1 非设备触发，不匹配
                 if (ObjUtil.notEqual(trigger.getType(), IotRuleSceneTriggerTypeEnum.DEVICE.getType())) {
                     return false;
@@ -328,13 +327,13 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
                     return false;
                 }
                 // 2.3 多个条件，只需要满足一个即可
-                IotRuleSceneTriggerCondition matchedCondition = CollUtil.findOne(trigger.getConditions(), condition -> {
+                IotRuleSceneDO.TriggerCondition matchedCondition = CollUtil.findOne(trigger.getConditions(), condition -> {
                     if (ObjUtil.notEqual(message.getType(), condition.getType())
                             || ObjUtil.notEqual(message.getIdentifier(), condition.getIdentifier())) {
                         return false;
                     }
                     // 多个条件参数，必须全部满足。所以，下面的逻辑就是找到一个不满足的条件参数
-                    IotRuleSceneTriggerConditionParameter notMatchedParameter = CollUtil.findOne(condition.getParameters(),
+                    IotRuleSceneDO.TriggerConditionParameter notMatchedParameter = CollUtil.findOne(condition.getParameters(),
                             parameter -> !isTriggerConditionParameterMatched(message, parameter, ruleScene, trigger));
                     return notMatchedParameter == null;
                 });
@@ -360,8 +359,8 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
      * @return 是否匹配
      */
     @SuppressWarnings({"unchecked", "DataFlowIssue"})
-    private boolean isTriggerConditionParameterMatched(IotDeviceMessage message, IotRuleSceneTriggerConditionParameter parameter,
+    private boolean isTriggerConditionParameterMatched(IotDeviceMessage message, IotRuleSceneDO.TriggerConditionParameter parameter,
-                                                       IotRuleSceneDO ruleScene, IotRuleSceneTriggerConfig trigger) {
+                                                       IotRuleSceneDO ruleScene, IotRuleSceneDO.TriggerConfig trigger) {
         // 1.1 校验操作符是否合法
         IotRuleSceneTriggerConditionParameterOperatorEnum operator =
                 IotRuleSceneTriggerConditionParameterOperatorEnum.operatorOf(parameter.getOperator());

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneAction.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.iot.service.rule.action;
 
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
 import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
 
@@ -23,7 +23,7 @@ public interface IotRuleSceneAction {
      *                2. 非空的情况：设备触发
      * @param config  配置
      */
-    void execute(@Nullable IotDeviceMessage message, IotRuleSceneActionConfig config) throws Exception;
+    void execute(@Nullable IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) throws Exception;
 
     /**
      * 获得类型

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneAlertAction.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.iot.service.rule.action;
 
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
 import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
 import org.springframework.stereotype.Component;
@@ -16,7 +16,7 @@ import javax.annotation.Nullable;
 public class IotRuleSceneAlertAction implements IotRuleSceneAction {
 
     @Override
-    public void execute(@Nullable IotDeviceMessage message, IotRuleSceneActionConfig config) {
+    public void execute(@Nullable IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) {
         // TODO @芋艿：待实现
     }
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java

@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.iot.service.rule.action;
 
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
 import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.service.rule.IotDataBridgeService;
@@ -29,7 +29,7 @@ public class IotRuleSceneDataBridgeAction implements IotRuleSceneAction {
     private List<IotDataBridgeExecute<?>> dataBridgeExecutes;
 
     @Override
-    public void execute(IotDeviceMessage message, IotRuleSceneActionConfig config) throws Exception {
+    public void execute(IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) throws Exception {
         // 1.1 如果消息为空，直接返回
         if (message == null) {
             return;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDeviceControlAction.java

@@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.iot.service.rule.action;
 
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.module.iot.controller.admin.device.vo.control.IotDeviceDownstreamReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
-import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionDeviceControl;
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
 import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
@@ -28,8 +27,8 @@ public class IotRuleSceneDeviceControlAction implements IotRuleSceneAction {
     private IotDeviceService deviceService;
 
     @Override
-    public void execute(IotDeviceMessage message, IotRuleSceneActionConfig config) {
+    public void execute(IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) {
-        IotRuleSceneActionDeviceControl control = config.getDeviceControl();
+        IotRuleSceneDO.ActionDeviceControl control = config.getDeviceControl();
         Assert.notNull(control, "设备控制配置不能为空");
         // 遍历每个设备，下发消息
         control.getDeviceNames().forEach(deviceName -> {

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelListReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelPageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelTSLRespVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
 import jakarta.validation.Valid;
 
@@ -91,12 +90,4 @@ public interface IotThingModelService {
      */
     Long getThingModelCount(LocalDateTime createTime);
 
-    /**
-     * 通过产品 ID 获取产品物模型 TSL
-     *
-     * @param productId 产品 ID
-     * @return 产品物模型 TSL
-     */
-    IotThingModelTSLRespVO getThingModelTslByProductId(Long productId);
-
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.iot.service.thingmodel;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
@@ -14,7 +13,6 @@ import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelS
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelListReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelPageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotThingModelTSLRespVO;
 import cn.iocoder.yudao.module.iot.convert.thingmodel.IotThingModelConvert;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotThingModelDO;
@@ -151,31 +149,6 @@ public class IotThingModelServiceImpl implements IotThingModelService {
         return thingModelMapper.selectList(reqVO);
     }
 
-    // TODO @puhui999：这个转换，放在 controller 貌似也行？
-    @Override
-    public IotThingModelTSLRespVO getThingModelTslByProductId(Long productId) {
-        IotThingModelTSLRespVO tslRespVO = new IotThingModelTSLRespVO();
-        // 1. 获得产品所有物模型定义
-        List<IotThingModelDO> thingModels = thingModelMapper.selectListByProductId(productId);
-        if (CollUtil.isEmpty(thingModels)) {
-            return tslRespVO;
-        }
-
-        // 2.1 设置公共部分参数
-        IotThingModelDO thingModel = thingModels.get(0);
-        tslRespVO.setProductId(thingModel.getProductId()).setProductKey(thingModel.getProductKey());
-        // 2.2 处理属性列表
-        tslRespVO.setProperties(convertList(filterList(thingModels, item ->
-                ObjUtil.equal(IotThingModelTypeEnum.PROPERTY.getType(), item.getType())), IotThingModelDO::getProperty));
-        // 2.3 处理服务列表
-        tslRespVO.setServices(convertList(filterList(thingModels, item ->
-                ObjUtil.equal(IotThingModelTypeEnum.SERVICE.getType(), item.getType())), IotThingModelDO::getService));
-        // 2.4 处理事件列表
-        tslRespVO.setEvents(convertList(filterList(thingModels, item ->
-                ObjUtil.equal(IotThingModelTypeEnum.EVENT.getType(), item.getType())), IotThingModelDO::getEvent));
-        return tslRespVO;
-    }
-
     /**
      * 校验功能是否存在
      *