From a9b18733ec1541423e4362c772ba0fa4d330e035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Thu, 17 Sep 2020 16:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9011218=2019081-=E5=AE=89=E7=81=AF?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=A2=9E=E5=8A=A0PLC=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-20200910=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java    | 20 ++++++++++++++++++++
 .../i3plus/pojo/andon/model/CommonMsgModel.java      |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
index 385b069..cc45276 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
+++ b/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;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
index 47588b4..b6ac672 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
+++ b/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;