diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8a3b947..b66e8d1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -145,8 +145,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MonitorProcessMessageType { - CONNECT_CONTROL(10, "CONNECT_CONTROL", "连接控制器"), - DISCONNECT_CONTROL(20, "DISCONNECT_CONTROL", "断开控制器"), + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "灭灯命令"), INTERFACE_FEEDBACK(100, "INTERFACE_FEEDBACK", "发送给界面actor通过websocket返回"); diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java new file mode 100644 index 0000000..297eacb --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/2/14 15:30 + * @desc + */ +@Data +@ApiModel("特定条件model") +public class SpecificRuleModel implements Serializable { + private static final long serialVersionUID = -4724747574943605500L; + + private List kList=new ArrayList<>(); + + private Map kvMap=new HashMap<>(); +}