Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test

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;
 }

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

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;
+    }
 }