【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java

@@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable {
     @ApiParam(value = "IP地址")
     private String nodeIP;
 
+    @Column(name = "CHANNEL")
+    @ApiParam("通道")
+    private String channel;
+
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
+    @Column(name = "OPC_URL")
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
+    @Column(name = "NAME_SPACE_INDEX")
+    @ApiParam("空间索引")
+    private Integer nameSpaceIndex = 2;
+
     @Column(name = "CHANNEL_NAME")
     @ApiParam(value = "通道名称")
     private String channelName;
@@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable {
     @ApiParam(value = "标签类型")
     private String tagType;
 
+    @Column(name = "DATA_TYPE")
+    @ApiParam("标签数据类型")
+    private String dataType;
+
     @Column(name = "GROUP_NO")
     @ApiParam(value = "分组号")
     private String groupNo;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable {
     private String msgType;
 
     @ApiModelProperty("消息数据")
-    private Map<String, Object> msgData;
+    private Map<String, Object> msgData = new HashMap<>();
 
     @ApiModelProperty("流程状态集合")
     private List<AndonRouteStatus> routeStatusList;