From e8f48bcb04a806024df574431f08cc11547e2ece Mon Sep 17 00:00:00 2001
From: joke lin <jokelin@jokedeMacBook-Pro.local>
Date: Tue, 17 Mar 2020 13:38:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
index cd951ae..122b4a5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :生产数据
@@ -112,7 +114,7 @@ public class MesProductData extends BaseBean implements Serializable {
     @Lob
     @Column(name = "LINE_DATA")
     @ApiParam("生产数据")
-    private String lineData;
+    private List lineData;
 
     @Lob
     @Transient

From 3b928c6ddc44fa9680887811b01da4e984a0c51f Mon Sep 17 00:00:00 2001
From: joke lin <jokelin@jokedeMacBook-Pro.local>
Date: Tue, 17 Mar 2020 16:08:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index d78860d..6c6aeec 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -126,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("OPC值")
-    private String opcValue;
+    private List opcValue;
 }

From 8881bafecf91331a6e97d19ff0dcfcf74bc12aca Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Tue, 17 Mar 2020 17:05:51 +0800
Subject: [PATCH 3/3] ptl pcn

---
 .../cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
index 32bbe43..f423f60 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
@@ -47,4 +47,22 @@ public class LightOnModel implements Serializable {
     @ApiParam("状态")
     private Integer status;
 
+    @ApiParam("控制器ip")
+    private String ip;
+
+    @ApiParam("端口")
+    private String port;
+
+    @ApiParam("控制器编号")
+    private String controlNo;
+
+    public LightOnModel() {
+    }
+
+    public LightOnModel(Integer tagNo, String ip, String port, String controlNo) {
+        this.tagNo = tagNo;
+        this.ip = ip;
+        this.port = port;
+        this.controlNo = controlNo;
+    }
 }