lac微服务模式优化

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

@@ -251,4 +251,80 @@ public class LacEnumUtil {
         }
     }
 
+    /**
+     * 指令操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMAND_OPERATE_TYPE{
+        COMMAND_STACK(10,"指令集"),
+        COMMAND_STACK_STEP(20,"指令集步骤"),
+        COMMAND_STACK_STEP_TASK(30,"指令集步骤任务");
+
+        private int value;
+        private String description;
+
+        COMMAND_OPERATE_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 COMMAND_OPERATE{
+        RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK);
+
+        private int value;
+        private String description;
+        private COMMAND_OPERATE_TYPE commandOperateType;
+
+        COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) {
+            this.value = value;
+            this.description = description;
+            this.commandOperateType = commandOperateType;
+        }
+
+        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;
+        }
+    }
+
 }

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-11-19 16:14
+ * @Modify:
+ **/
+@Data
+@ApiModel("指令操作")
+public class LacCommandOperate {
+
+    @ApiParam(value ="指令集记录id" , example = "-1")
+    private Long commandStackRecordId;
+
+    @ApiParam(value ="步骤任务id" , example = "-1")
+    private Long commandStackStepTaskIdId;
+
+    @ApiParam(value ="操作类型" , example = "-1")
+    private Integer operateType;
+
+    @ApiParam(value ="操作" , example = "-1")
+    private Integer operate;
+
+}

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

@@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
     private String executionDescription;
 
     @Transient
+    @ApiParam(value ="Lac实例id")
+    private String lacInstanceId;
+
+    @Transient
     @ApiParam(value ="指令集模板")
     private LacCommandStackTemplate template;
 

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

@@ -2,9 +2,19 @@ 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.enumutil.LacEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.lac.bean.*;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
-
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
+import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
+import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
 import java.util.List;
 
 /**
@@ -61,9 +71,9 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean);
 
         return ddlPackBean;
@@ -104,7 +114,7 @@ public class LacHqlPack {
 
     public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-        if(bean == null){
+        if (bean == null) {
             return ddlPackBean;
         }
         DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean);
@@ -143,4 +153,10 @@ public class LacHqlPack {
         );
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlNotFinishLacCommandStackRecord() {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean);
+        return ddlPackBean;
+    }
 }

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

@@ -44,6 +44,7 @@ public class LacCommandStackModel {
      */
     private Exception exception;
 
+
     public void setException(Exception exception){
         LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception);
         this.exception = exception;