From f358c13b04c6efaf5975f66deae9e073d4d101f3 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 23:12:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ptl=E8=BF=81=E7=A7=BB4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 4 ++-- .../pojo/ptl/pcn/model/SpecificRuleModel.java | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java 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<>(); +} From 5afcf20a9ea4423b6610af2eb492a7934c0abead Mon Sep 17 00:00:00 2001 From: luweihao Date: Sat, 15 Feb 2020 15:21:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ptlpcn=20=E6=B7=BB=E5=8A=A0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=A1=E5=8F=B7=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 43 +++++++++++++++++++++- .../pojo/ptl/pcn/bean/PtlInterfaceElement.java | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) 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 b66e8d1..65b443f 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 @@ -149,7 +149,7 @@ public class PtlPcnEnumUtil { 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返回"); + INTERFACE_SIGNAL_CMD(50, "INTERFACE_SIGNAL_CMD", "发送给界面actor通过websocket返回"); private int value; private String code; @@ -187,6 +187,47 @@ 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", "亮灯命令"); + + private int value; + private String code; + private String description; + + InterfaceSignalMessageType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static InterfaceSignalMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java index 61d9af6..843fc9c 100644 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java @@ -22,7 +22,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "PTL_ELEMENT_ATTRIBUTE") +@Table(name = "PTL_INTERFACE_ELEMENT") @EqualsAndHashCode(callSuper = true) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable {