【代码优化】IoT: 规则场景 config 抽离
This commit is contained in:
puhui999
parent
6d6547be39
commit
f118d66006
|
|
@ -1,9 +1,12 @@
|
|||
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.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")
|
||||
@Data
|
||||
|
|
@ -22,10 +25,10 @@ public class IotRuleSceneRespVO {
|
|||
private Integer status;
|
||||
|
||||
@Schema(description = "触发器数组", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String triggers;
|
||||
private List<IotRuleSceneTriggerConfig> triggers;
|
||||
|
||||
@Schema(description = "执行器数组", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String actions;
|
||||
private List<IotRuleSceneActionConfig> actions;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private LocalDateTime createTime;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,15 @@ 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.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;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "管理后台 - IoT 规则场景（场景联动）新增/修改 Request VO")
|
||||
@Data
|
||||
public class IotRuleSceneSaveReqVO {
|
||||
|
|
@ -28,10 +32,10 @@ public class IotRuleSceneSaveReqVO {
|
|||
|
||||
@Schema(description = "触发器数组", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "触发器数组不能为空")
|
||||
private String triggers;
|
||||
private List<IotRuleSceneTriggerConfig> triggers;
|
||||
|
||||
@Schema(description = "执行器数组", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "执行器数组不能为空")
|
||||
private String actions;
|
||||
private List<IotRuleSceneActionConfig> actions;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 执行器配置
|
||||
*
|
||||
* @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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 执行设备控制
|
||||
*
|
||||
* @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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 触发条件
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
@Data
|
||||
public class IotRuleSceneTriggerCondition {
|
||||
|
||||
/**
|
||||
* 消息类型
|
||||
*
|
||||
* 枚举 {@link IotDeviceMessageTypeEnum}
|
||||
*/
|
||||
private String type;
|
||||
/**
|
||||
* 消息标识符
|
||||
*
|
||||
* 枚举 {@link IotDeviceMessageIdentifierEnum}
|
||||
*/
|
||||
private String identifier;
|
||||
|
||||
/**
|
||||
* 参数数组
|
||||
*
|
||||
* 参数与参数之间，是“或”的关系
|
||||
*/
|
||||
private List<IotRuleSceneTriggerConditionParameter> parameters;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 触发条件参数
|
||||
*
|
||||
* @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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 触发器配置
|
||||
*
|
||||
* @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;
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +1,19 @@
|
|||
package cn.iocoder.yudao.module.iot.dal.dataobject.rule;
|
||||
|
||||
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
|
||||
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.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 cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
|
||||
import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneTriggerConfig;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import lombok.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* IoT 规则场景（场景联动） DO
|
||||
|
|
@ -56,188 +52,12 @@ public class IotRuleSceneDO extends TenantBaseDO {
|
|||
* 触发器数组
|
||||
*/
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private List<TriggerConfig> triggers;
|
||||
private List<IotRuleSceneTriggerConfig> triggers;
|
||||
|
||||
/**
|
||||
* 执行器数组
|
||||
*/
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
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;
|
||||
|
||||
}
|
||||
private List<IotRuleSceneActionConfig> actions;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ 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;
|
||||
|
|
@ -117,82 +118,82 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
if (true) {
|
||||
IotRuleSceneDO ruleScene01 = new IotRuleSceneDO();
|
||||
ruleScene01.setTriggers(CollUtil.newArrayList());
|
||||
IotRuleSceneDO.TriggerConfig trigger01 = new IotRuleSceneDO.TriggerConfig();
|
||||
IotRuleSceneTriggerConfig trigger01 = new IotRuleSceneTriggerConfig();
|
||||
trigger01.setType(IotRuleSceneTriggerTypeEnum.DEVICE.getType());
|
||||
trigger01.setConditions(CollUtil.newArrayList());
|
||||
// 属性
|
||||
IotRuleSceneDO.TriggerCondition condition01 = new IotRuleSceneDO.TriggerCondition();
|
||||
IotRuleSceneTriggerCondition condition01 = new IotRuleSceneTriggerCondition();
|
||||
condition01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
|
||||
condition01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_REPORT.getIdentifier());
|
||||
condition01.setParameters(CollUtil.newArrayList());
|
||||
// IotRuleSceneDO.TriggerConditionParameter parameter010 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
// IotRuleSceneTriggerConditionParameter parameter010 = new IotRuleSceneTriggerConditionParameter();
|
||||
// parameter010.setIdentifier("width");
|
||||
// parameter010.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
|
||||
// parameter010.setValue("abc");
|
||||
// condition01.getParameters().add(parameter010);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter011 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter011 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter011.setIdentifier("width");
|
||||
parameter011.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
|
||||
parameter011.setValue("1");
|
||||
condition01.getParameters().add(parameter011);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter012 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter012 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter012.setIdentifier("width");
|
||||
parameter012.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.getOperator());
|
||||
parameter012.setValue("2");
|
||||
condition01.getParameters().add(parameter012);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter013 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter013 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter013.setIdentifier("width");
|
||||
parameter013.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN.getOperator());
|
||||
parameter013.setValue("0");
|
||||
condition01.getParameters().add(parameter013);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter014 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter014 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter014.setIdentifier("width");
|
||||
parameter014.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS.getOperator());
|
||||
parameter014.setValue("0");
|
||||
condition01.getParameters().add(parameter014);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter015 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter015 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter015.setIdentifier("width");
|
||||
parameter015.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN.getOperator());
|
||||
parameter015.setValue("2");
|
||||
condition01.getParameters().add(parameter015);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter016 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter016 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter016.setIdentifier("width");
|
||||
parameter016.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS.getOperator());
|
||||
parameter016.setValue("2");
|
||||
condition01.getParameters().add(parameter016);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter017 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter017 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter017.setIdentifier("width");
|
||||
parameter017.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.IN.getOperator());
|
||||
parameter017.setValue("1,2,3");
|
||||
condition01.getParameters().add(parameter017);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter018 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter018 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter018.setIdentifier("width");
|
||||
parameter018.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_IN.getOperator());
|
||||
parameter018.setValue("0,2,3");
|
||||
condition01.getParameters().add(parameter018);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter019 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter019 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter019.setIdentifier("width");
|
||||
parameter019.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.BETWEEN.getOperator());
|
||||
parameter019.setValue("1,3");
|
||||
condition01.getParameters().add(parameter019);
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter020 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter020 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter020.setIdentifier("width");
|
||||
parameter020.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_BETWEEN.getOperator());
|
||||
parameter020.setValue("2,3");
|
||||
condition01.getParameters().add(parameter020);
|
||||
trigger01.getConditions().add(condition01);
|
||||
// 状态
|
||||
IotRuleSceneDO.TriggerCondition condition02 = new IotRuleSceneDO.TriggerCondition();
|
||||
IotRuleSceneTriggerCondition condition02 = new IotRuleSceneTriggerCondition();
|
||||
condition02.setType(IotDeviceMessageTypeEnum.STATE.getType());
|
||||
condition02.setIdentifier(IotDeviceMessageIdentifierEnum.STATE_ONLINE.getIdentifier());
|
||||
condition02.setParameters(CollUtil.newArrayList());
|
||||
trigger01.getConditions().add(condition02);
|
||||
// 事件
|
||||
IotRuleSceneDO.TriggerCondition condition03 = new IotRuleSceneDO.TriggerCondition();
|
||||
IotRuleSceneTriggerCondition condition03 = new IotRuleSceneTriggerCondition();
|
||||
condition03.setType(IotDeviceMessageTypeEnum.EVENT.getType());
|
||||
condition03.setIdentifier("xxx");
|
||||
condition03.setParameters(CollUtil.newArrayList());
|
||||
IotRuleSceneDO.TriggerConditionParameter parameter030 = new IotRuleSceneDO.TriggerConditionParameter();
|
||||
IotRuleSceneTriggerConditionParameter parameter030 = new IotRuleSceneTriggerConditionParameter();
|
||||
parameter030.setIdentifier("width");
|
||||
parameter030.setOperator(IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.getOperator());
|
||||
parameter030.setValue("1");
|
||||
|
|
@ -201,21 +202,21 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
// 动作
|
||||
ruleScene01.setActions(CollUtil.newArrayList());
|
||||
// 设备控制
|
||||
IotRuleSceneDO.ActionConfig action01 = new IotRuleSceneDO.ActionConfig();
|
||||
IotRuleSceneActionConfig action01 = new IotRuleSceneActionConfig();
|
||||
action01.setType(IotRuleSceneActionTypeEnum.DEVICE_CONTROL.getType());
|
||||
IotRuleSceneDO.ActionDeviceControl actionDeviceControl01 = new IotRuleSceneDO.ActionDeviceControl();
|
||||
actionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
|
||||
actionDeviceControl01.setDeviceNames(ListUtil.of("small"));
|
||||
actionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
|
||||
actionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
|
||||
actionDeviceControl01.setData(MapUtil.<String, Object>builder()
|
||||
IotRuleSceneActionDeviceControl iotRuleSceneActionDeviceControl01 = new IotRuleSceneActionDeviceControl();
|
||||
iotRuleSceneActionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
|
||||
iotRuleSceneActionDeviceControl01.setDeviceNames(ListUtil.of("small"));
|
||||
iotRuleSceneActionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
|
||||
iotRuleSceneActionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
|
||||
iotRuleSceneActionDeviceControl01.setData(MapUtil.<String, Object>builder()
|
||||
.put("power", 1)
|
||||
.put("color", "red")
|
||||
.build());
|
||||
action01.setDeviceControl(actionDeviceControl01);
|
||||
action01.setDeviceControl(iotRuleSceneActionDeviceControl01);
|
||||
// ruleScene01.getActions().add(action01); // TODO 芋艿：先不测试了
|
||||
// 数据桥接（http）
|
||||
IotRuleSceneDO.ActionConfig action02 = new IotRuleSceneDO.ActionConfig();
|
||||
IotRuleSceneActionConfig action02 = new IotRuleSceneActionConfig();
|
||||
action02.setType(IotRuleSceneActionTypeEnum.DATA_BRIDGE.getType());
|
||||
action02.setDataBridgeId(1L);
|
||||
ruleScene01.getActions().add(action02);
|
||||
|
|
@ -225,7 +226,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
List<IotRuleSceneDO> list = ruleSceneMapper.selectList();
|
||||
// TODO @芋艿：需要考虑开启状态
|
||||
return filterList(list, ruleScene -> {
|
||||
for (IotRuleSceneDO.TriggerConfig trigger : ruleScene.getTriggers()) {
|
||||
for (IotRuleSceneTriggerConfig trigger : ruleScene.getTriggers()) {
|
||||
if (ObjUtil.notEqual(trigger.getProductKey(), productKey)) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -260,22 +261,22 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
IotRuleSceneDO scene = new IotRuleSceneDO().setStatus(CommonStatusEnum.ENABLE.getStatus());
|
||||
if (true) {
|
||||
scene.setTenantId(1L);
|
||||
IotRuleSceneDO.TriggerConfig triggerConfig = new IotRuleSceneDO.TriggerConfig();
|
||||
triggerConfig.setType(IotRuleSceneTriggerTypeEnum.TIMER.getType());
|
||||
scene.setTriggers(ListUtil.toList(triggerConfig));
|
||||
IotRuleSceneTriggerConfig iotRuleSceneTriggerConfig = new IotRuleSceneTriggerConfig();
|
||||
iotRuleSceneTriggerConfig.setType(IotRuleSceneTriggerTypeEnum.TIMER.getType());
|
||||
scene.setTriggers(ListUtil.toList(iotRuleSceneTriggerConfig));
|
||||
// 动作
|
||||
IotRuleSceneDO.ActionConfig action01 = new IotRuleSceneDO.ActionConfig();
|
||||
IotRuleSceneActionConfig action01 = new IotRuleSceneActionConfig();
|
||||
action01.setType(IotRuleSceneActionTypeEnum.DEVICE_CONTROL.getType());
|
||||
IotRuleSceneDO.ActionDeviceControl actionDeviceControl01 = new IotRuleSceneDO.ActionDeviceControl();
|
||||
actionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
|
||||
actionDeviceControl01.setDeviceNames(ListUtil.of("small"));
|
||||
actionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
|
||||
actionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
|
||||
actionDeviceControl01.setData(MapUtil.<String, Object>builder()
|
||||
IotRuleSceneActionDeviceControl iotRuleSceneActionDeviceControl01 = new IotRuleSceneActionDeviceControl();
|
||||
iotRuleSceneActionDeviceControl01.setProductKey("4aymZgOTOOCrDKRT");
|
||||
iotRuleSceneActionDeviceControl01.setDeviceNames(ListUtil.of("small"));
|
||||
iotRuleSceneActionDeviceControl01.setType(IotDeviceMessageTypeEnum.PROPERTY.getType());
|
||||
iotRuleSceneActionDeviceControl01.setIdentifier(IotDeviceMessageIdentifierEnum.PROPERTY_SET.getIdentifier());
|
||||
iotRuleSceneActionDeviceControl01.setData(MapUtil.<String, Object>builder()
|
||||
.put("power", 1)
|
||||
.put("color", "red")
|
||||
.build());
|
||||
action01.setDeviceControl(actionDeviceControl01);
|
||||
action01.setDeviceControl(iotRuleSceneActionDeviceControl01);
|
||||
scene.setActions(ListUtil.toList(action01));
|
||||
}
|
||||
if (scene == null) {
|
||||
|
|
@ -287,7 +288,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
return;
|
||||
}
|
||||
// 1.2 判断是否有定时触发器，避免脏数据
|
||||
IotRuleSceneDO.TriggerConfig config = CollUtil.findOne(scene.getTriggers(),
|
||||
IotRuleSceneTriggerConfig config = CollUtil.findOne(scene.getTriggers(),
|
||||
trigger -> ObjUtil.equals(trigger.getType(), IotRuleSceneTriggerTypeEnum.TIMER.getType()));
|
||||
if (config == null) {
|
||||
log.error("[executeRuleSceneByTimer][规则场景({}) 不存在定时触发器]", scene);
|
||||
|
|
@ -316,7 +317,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
|
||||
// 2. 匹配 trigger 触发器的条件
|
||||
return filterList(ruleScenes, ruleScene -> {
|
||||
for (IotRuleSceneDO.TriggerConfig trigger : ruleScene.getTriggers()) {
|
||||
for (IotRuleSceneTriggerConfig trigger : ruleScene.getTriggers()) {
|
||||
// 2.1 非设备触发，不匹配
|
||||
if (ObjUtil.notEqual(trigger.getType(), IotRuleSceneTriggerTypeEnum.DEVICE.getType())) {
|
||||
return false;
|
||||
|
|
@ -327,13 +328,13 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
return false;
|
||||
}
|
||||
// 2.3 多个条件，只需要满足一个即可
|
||||
IotRuleSceneDO.TriggerCondition matchedCondition = CollUtil.findOne(trigger.getConditions(), condition -> {
|
||||
IotRuleSceneTriggerCondition matchedCondition = CollUtil.findOne(trigger.getConditions(), condition -> {
|
||||
if (ObjUtil.notEqual(message.getType(), condition.getType())
|
||||
|| ObjUtil.notEqual(message.getIdentifier(), condition.getIdentifier())) {
|
||||
return false;
|
||||
}
|
||||
// 多个条件参数，必须全部满足。所以，下面的逻辑就是找到一个不满足的条件参数
|
||||
IotRuleSceneDO.TriggerConditionParameter notMatchedParameter = CollUtil.findOne(condition.getParameters(),
|
||||
IotRuleSceneTriggerConditionParameter notMatchedParameter = CollUtil.findOne(condition.getParameters(),
|
||||
parameter -> !isTriggerConditionParameterMatched(message, parameter, ruleScene, trigger));
|
||||
return notMatchedParameter == null;
|
||||
});
|
||||
|
|
@ -348,6 +349,7 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
}
|
||||
|
||||
// TODO @芋艿：【可优化】可以考虑增加下单测，边界太多了。
|
||||
|
||||
/**
|
||||
* 判断触发器的条件参数是否匹配
|
||||
*
|
||||
|
|
@ -358,8 +360,8 @@ public class IotRuleSceneServiceImpl implements IotRuleSceneService {
|
|||
* @return 是否匹配
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "DataFlowIssue"})
|
||||
private boolean isTriggerConditionParameterMatched(IotDeviceMessage message, IotRuleSceneDO.TriggerConditionParameter parameter,
|
||||
IotRuleSceneDO ruleScene, IotRuleSceneDO.TriggerConfig trigger) {
|
||||
private boolean isTriggerConditionParameterMatched(IotDeviceMessage message, IotRuleSceneTriggerConditionParameter parameter,
|
||||
IotRuleSceneDO ruleScene, IotRuleSceneTriggerConfig trigger) {
|
||||
// 1.1 校验操作符是否合法
|
||||
IotRuleSceneTriggerConditionParameterOperatorEnum operator =
|
||||
IotRuleSceneTriggerConditionParameterOperatorEnum.operatorOf(parameter.getOperator());
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.module.iot.service.rule.action;
|
||||
|
||||
import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
|
||||
import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
|
||||
import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
|
||||
import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
|
||||
|
||||
|
|
@ -14,6 +14,7 @@ import javax.annotation.Nullable;
|
|||
public interface IotRuleSceneAction {
|
||||
|
||||
// TODO @芋艿：groovy 或者 javascript 实现数据的转换；可以考虑基于 hutool 的 ScriptUtil 做
|
||||
|
||||
/**
|
||||
* 执行场景
|
||||
*
|
||||
|
|
@ -22,7 +23,7 @@ public interface IotRuleSceneAction {
|
|||
* 2. 非空的情况：设备触发
|
||||
* @param config 配置
|
||||
*/
|
||||
void execute(@Nullable IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) throws Exception;
|
||||
void execute(@Nullable IotDeviceMessage message, IotRuleSceneActionConfig config) throws Exception;
|
||||
|
||||
/**
|
||||
* 获得类型
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.module.iot.service.rule.action;
|
||||
|
||||
import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
|
||||
import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.scene.config.IotRuleSceneActionConfig;
|
||||
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, IotRuleSceneDO.ActionConfig config) {
|
||||
public void execute(@Nullable IotDeviceMessage message, IotRuleSceneActionConfig config) {
|
||||
// TODO @芋艿：待实现
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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, IotRuleSceneDO.ActionConfig config) throws Exception {
|
||||
public void execute(IotDeviceMessage message, IotRuleSceneActionConfig config) throws Exception {
|
||||
// 1.1 如果消息为空，直接返回
|
||||
if (message == null) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@ 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;
|
||||
|
|
@ -27,8 +28,8 @@ public class IotRuleSceneDeviceControlAction implements IotRuleSceneAction {
|
|||
private IotDeviceService deviceService;
|
||||
|
||||
@Override
|
||||
public void execute(IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) {
|
||||
IotRuleSceneDO.ActionDeviceControl control = config.getDeviceControl();
|
||||
public void execute(IotDeviceMessage message, IotRuleSceneActionConfig config) {
|
||||
IotRuleSceneActionDeviceControl control = config.getDeviceControl();
|
||||
Assert.notNull(control, "设备控制配置不能为空");
|
||||
// 遍历每个设备，下发消息
|
||||
control.getDeviceNames().forEach(deviceName -> {
|
||||
|
|
|
|||
Loading…
Reference in New Issue