task `1430` 工位扫描，产品信号监听，队列监听

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

@@ -4062,4 +4062,76 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工位监听组件触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -204,8 +204,8 @@ public class MesPcnEnumUtil {
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
-        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
 
         private int value;
         private String code;
@@ -2806,4 +2806,76 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工位监听组件触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java

@@ -48,6 +48,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("PLC IP")
     private String plcIp;
 
+    @Column(name = "OPC_URL")
+    @ApiParam("OPC URL")
+    private String opcUrl;
+
     @Column(name = "CHANNEL")
     @ApiParam("通道")
     private String channel;
@@ -104,6 +108,14 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam("密码")
+    private String password;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -72,7 +72,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "产品生产类型")
+    @Column(name = "PPT_CODE")
     @ApiParam("产品类型名称")
     private String pptCode;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE")
+@Api("作业程序组件参数")
+public class MesWorkCellModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3537487776977917751L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE_PARAM")
+@Api("作业程序组件参数")
+public class MesWorkCellModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4836155960343256982L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("调用类")
+    private String callClass;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE")
+@Api("作业程序组件")
+public class MesWorkModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4121840589026322086L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("组件名称")
+    private String moduleName;
+
+    @Column(name = "MODULE_TYPE")
+    @ApiParam("组件类型")
+    private Integer moduleType;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("调用类")
+    private String callClass;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE_PARAM")
+@Api("作业程序组件参数")
+public class MesWorkModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3965186392895014717L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
@@ -10,28 +12,45 @@ import java.util.Map;
  * @date 2020/3/9 15:35
  * @desc
  */
-@Data
-public class ActorMessageModel<T> {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActorMessageModel {
 
-    private String msgType;
+    private boolean success;
 
-    private String clientInfo;
+    private Object dataObj;
 
-    private String workCellCode;
+    public boolean isSuccess() {
+        return success;
+    }
 
-    private String workCenterCode;
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
 
-    private String organizeCode;
+    public Object getDataObj() {
+        return dataObj;
+    }
 
-    private String routeCode;
+    public void setDataObj(Object dataObj) {
+        this.dataObj = dataObj;
+    }
 
-    private String serialNumber;
+    public static ActorMessageModel getSuccess() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private String productSn;
+    public static ActorMessageModel getFailure() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private T dataObj;
+    public static ActorMessageModel getSuccess(Object data) {
+        return new ActorMessageModel(true, data);
+    }
+
+    public static ActorMessageModel getFailure(Object data) {
+        return new ActorMessageModel(false, data);
+    }
 
-    private List<? extends T> dataList;
 
-    private Map<String, Object> dataMap;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/10 15:24
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MonitoringModel {
+
+    private String monitorType;
+
+    private Boolean isStop;
+
+    private MesWorkModule workModule;
+
+    private List<MesWorkCellModuleParam> cellModuleParams;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -67,6 +67,15 @@ public class StationRequestBean implements Serializable {
     @ApiParam("业务类型")
     private String busiType;
 
+    @ApiParam("工位监听类型")
+    private String monitorType;
+
+    @ApiParam("工位监听组件")
+    private String monitorModule;
+
+    @ApiParam("工位监听消息")
+    private String monitorMsg;
+
     @ApiParam("工单号")
     private String workOrderNo;
 
@@ -79,26 +88,4 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
-    @Override
-    public String toString() {
-        return "StationRequestBean{" +
-                "scanInfo='" + scanInfo + '\'' +
-                ", serialNumber='" + serialNumber + '\'' +
-                ", partNo='" + partNo + '\'' +
-                ", organizeCode='" + organizeCode + '\'' +
-                ", organizeName='" + organizeName + '\'' +
-                ", workCenterCode='" + workCenterCode + '\'' +
-                ", workCellCode='" + workCellCode + '\'' +
-                ", routeCode='" + routeCode + '\'' +
-                ", processCode='" + processCode + '\'' +
-                ", clientInfo='" + clientInfo + '\'' +
-                ", userInfo='" + userInfo + '\'' +
-                ", buttonCode='" + buttonCode + '\'' +
-                ", stepCode='" + stepCode + '\'' +
-                ", busiType='" + busiType + '\'' +
-                ", workOrderNo='" + workOrderNo + '\'' +
-                ", tray='" + tray + '\'' +
-                ", finishCount=" + finishCount +
-                '}';
-    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/13 17:55
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class StepDispatchModel {
+
+    private String stepListKey;
+
+    private String firstScanKey;
+
+    private String cellParamKey;
+
+    private String scanInfo;
+
+    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) {
+        this.stepListKey = stepListKey;
+        this.firstScanKey = firstScanKey;
+        this.cellParamKey = cellParamKey;
+        this.scanInfo = scanInfo;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModule;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkCellModuleParamRepository extends BaseRepository<MesWorkCellModuleParam, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkCellModuleRepository extends BaseRepository<MesWorkCellModule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkModuleParamRepository extends BaseRepository<MesWorkModuleParam, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkModuleRepository extends BaseRepository<MesWorkModule, Long> {
+}