Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java

@@ -145,11 +145,11 @@ public class PtlPcnEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MonitorProcessMessageType {
-        CONNECT_CONTROL(10, "CONNECT_CONTROL", "连接控制器"),
+        CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "连接控制器"),
-        DISCONNECT_CONTROL(20, "DISCONNECT_CONTROL", "断开控制器"),
+        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", "控制器相关");
 

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 {

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<String> kList=new ArrayList<>();
+
+    private Map<String,String> kvMap=new HashMap<>();
+}