Lac调度实体

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

@@ -862,6 +862,5 @@ public class BlockSoftSwitchEnumUtil {
             }
             return null;
         }
-
     }
 }

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

@@ -0,0 +1,179 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 13:37
+ * @Modify:
+ **/
+public class LacEnumUtil {
+
+    /**
+     * 适配器类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUIT_CASE_TYPE {
+        SOFTWARE(10, "软件"),
+        HARDWARE(20,  "硬件");
+
+        private int value;
+        private String description;
+
+        private SUIT_CASE_TYPE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static LacEnumUtil.SUIT_CASE_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 硬件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HARDWARE_TYPE {
+        OPC_READ(10, "读OPC"),
+        OPC_WRITE(20,  "写OPC");
+
+        private int value;
+        private String description;
+
+        private HARDWARE_TYPE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static LacEnumUtil.HARDWARE_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PARAM_TYPE{
+        OUT_PARAM(1,"出参"),
+        IN_PARAM(2,"入参");
+
+        private int value;
+        private String description;
+
+        PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 指令集状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STACK_STATUS{
+        RUNNING(1,"运行中"),
+        PAUSE(2,"暂停"),
+        FINISH(3,"完成");
+
+        private int value;
+        private String description;
+
+        STACK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static boolean isRunning(int val) {
+            return RUNNING.getValue() == val;
+        }
+    }
+
+}

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java

@@ -9,10 +9,11 @@ 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 javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :
@@ -47,7 +48,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="LAC_COMMAND_STACK_STEP")
-@Api(value="指令集模板",description = "指令集模板信息")
+@Api(value="指令集步骤",description = "指令集步骤")
 public class LacCommandStackStep extends BaseBean {
 
     @Column(name="TEMPLATE_ID")
@@ -69,10 +70,13 @@ public class LacCommandStackStep extends BaseBean {
 
     @Column(name="STEP_EXEC_COND")
     @ApiParam(value ="步骤执行条件")
-    private Integer stepExecCond;
+    private Double stepExecCond;
 
     @Column(name="STEP_DESCRIPTION")
     @ApiParam(value ="步骤执行条件")
     private String stepDescription;
 
+    @Transient
+    @ApiParam(value ="步骤任务列表")
+    private List<LacCommandStackStepTask> stepTaskList;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -67,7 +68,6 @@ public class LacCommandStackStepTask extends BaseBean {
 //    @ApiParam(value ="模板代码")
 //    private String templateCodeRdd;
 
-
     @Column(name="STEP_ID")
     @ApiParam(value ="步骤ID")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -94,9 +94,11 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="任务代码")
     private String taskCodeRdd;
 
-
     @Column(name="IS_CRUX")
     @ApiParam(value ="是否关键")
     private Integer isCrux;
 
+    @Transient
+    @ApiParam(value ="适配任务")
+    private LacSuitTask lacSuitTask;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java

@@ -9,10 +9,11 @@ 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 javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :
@@ -77,4 +78,7 @@ public class LacCommandStackTemplate extends BaseBean {
     @ApiParam(value ="模板描述")
     private String templateDescription;
 
+    @Transient
+    @ApiParam(value ="步骤列表")
+    private List<LacCommandStackStep> stepList;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java

@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :
@@ -113,4 +115,19 @@ public class LacSuitTask extends BaseBean {
     @ApiParam(value ="任务描述")
     private String taskDescription;
 
+    @Transient
+    @ApiParam(value ="适配套件")
+    private LacSuitCase lacSuitCase;
+
+    @Transient
+    @ApiParam(value ="适配参数")
+    private List<LacSuitTaskParam> lacSuitTaskParamList;
+
+    @Transient
+    @ApiParam(value ="入参适配")
+    private List<LacSuitTaskParamAdapter> inputParamAdapterList;
+
+    @Transient
+    @ApiParam(value ="出参适配")
+    private List<LacSuitTaskParamAdapter> outputParamAdapterList;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -87,4 +88,8 @@ public class LacSuitTaskParam extends BaseBean {
     @Column(name="PARAM_DESCRIPTION")
     @ApiParam(value ="参数描述")
     private String paramDescription;
+
+    @Transient
+    @ApiParam(value ="参数值")
+    private Object value;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.lac.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.lac.bean.*;
 
 /**
@@ -15,33 +17,44 @@ public class LacHqlPack {
     private LacHqlPack() {
     }
 
-    public static DdlPackBean packHqlLacTaskType(LacTaskType bean){
+    public static DdlPackBean packHqlLacTaskType(LacTaskType bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){
+    public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlLacLogTask(LacLogTask bean){
+    public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){
+    public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){
+    public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlLacCommandStackStepByTemplateId(Long templateId) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getNumEqualPack(templateId, "templateId", ddlPackBean);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
+                new String[]{"stepSort"},
+                ddlPackBean
+        );
+        return ddlPackBean;
+    }
 }

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

@@ -60,7 +60,7 @@ public class MesDatasource extends BaseBean {
     @ApiParam("设备代码")
     private String equipmentCode;
 
-    @Column(name = "DS_DB_NAME")
+    @Column(name = "DS_DB_NAMsE")
     @ApiParam("数据库名称")
     private String dsDbName;
 

modules/i3plus-pojo-model/pom.xml

@@ -43,15 +43,22 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-wms</artifactId>
         </dependency>
+
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-form</artifactId>
         </dependency>
+
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-softswitch</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-lac</artifactId>
+        </dependency>
+
     </dependencies>
 
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.model.lac;
+
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
+import lombok.Data;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Description : lac指令集model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 15:29
+ * @Modify:
+ **/
+@Data
+public class LacCommandStackModel {
+
+    /**
+     * 指令集记录id
+     */
+    private Long recordId;
+
+    /**
+     * 指令集模板
+     */
+    @Deprecated
+    private LacCommandStackTemplate commandStackTemplate;
+
+    /**
+     * 指令集记录
+     */
+    private LacCommandStackRecord commandStackRecord;
+
+    /**
+     * 请求数据
+     */
+    private LacSuitRequest request;
+
+    /**
+     * 响应数据
+     */
+    private LacSuitResponse response;
+
+    /**
+     * 任务原始报文
+     * key : 任务编号
+     * value ： 原始报文
+     */
+    private Map<Long, Object> orginMessage = new ConcurrentHashMap<>();
+
+    /**
+     * 任务转换后报文
+     * key : 任务编号
+     * value ： 转换后报文
+     */
+    private Map<Long, String> transMessage = new ConcurrentHashMap<>();
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.lac;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+import java.util.List;
+
+/**
+ * @Description : lac 适配请求信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 15:07
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("request")
+public class LacSuitRequest {
+
+    /**
+     * 指令集代码
+     */
+    private String commandStackCode;
+
+    /**
+     * 参数集合
+     */
+    private List<Task> taskList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.lac;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+/**
+ * @Description : lac 适配响应信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 15:07
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("response")
+public class LacSuitResponse {
+
+    /**
+     * 是否成功
+     */
+    private boolean success;
+
+    /**
+     * 状态码
+     */
+    private String code;
+
+    /**
+     * 状态信息
+     */
+    private String message;
+
+    /**
+     * 返回数据
+     */
+    private Object result;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.model.lac;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 17:06
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("task")
+public class Task {
+
+    private String code;
+
+    private List<TaskParam> paramList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.lac;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-10-29 15:10
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("param")
+@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"})
+public class TaskParam {
+
+    private String name;
+
+    private String value;
+
+}

pom.xml

@@ -134,6 +134,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-lac</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- spring-json转换 -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>