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 65b443f..109441d 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,19 +145,22 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MonitorProcessMessageType { - 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_SIGNAL_CMD(50, "INTERFACE_SIGNAL_CMD", "发送给界面actor通过websocket返回"); + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), + LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"), + CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), + INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); private int value; private String code; + private String callClass; private String description; - MonitorProcessMessageType(int value, String code, String description) { + MonitorProcessMessageType(int value, String code, String callClass, String description) { this.value = value; this.code = code; + this.callClass = callClass; this.description = description; } @@ -169,6 +172,10 @@ public class PtlPcnEnumUtil { return code; } + public String getCallClass() { + return callClass; + } + public String getDescription() { return description; } @@ -188,17 +195,19 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum InterfaceSignalMessageType { - CONNECT_CONTROL_CMD(10, "111111", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "222222", "断开控制器"), - LIGHT_ON_CMD(30, "333333", "亮灯命令"); + CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"), + LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令"); private int value; private String code; + private String callClass; private String description; - InterfaceSignalMessageType(int value, String code, String description) { + InterfaceSignalMessageType(int value, String code, String callClass, String description) { this.value = value; this.code = code; + this.callClass = callClass; this.description = description; } @@ -206,6 +215,10 @@ public class PtlPcnEnumUtil { return value; } + public String getCallClass() { + return callClass; + } + public String getCode() { return code; } diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java index e664646..f99aca1 100644 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class AttrModel implements Serializable { + private static final long serialVersionUID = -4842958192243396773L; @ApiParam("属性名称") private String attrName; diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/LightOnModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/LightOnModel.java new file mode 100644 index 0000000..220c92b --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/LightOnModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/15 15:42 + * @desc + */ +@Data +@ToString +public class LightOnModel implements Serializable { + private static final long serialVersionUID = -1089361557513425229L; + +}