Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -667,7 +667,7 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM", 111020006, "质量"),
         EQUIP("EQUMENT_ALARM", 111020007, "设备"),
         PROCESS("ROUTING_ALARM", 111020008, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "其他"),
+        CHECK("OTHER_ALARM", 111020009, "自处理"),
         FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
 
         private String value;

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

@@ -141,9 +141,13 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STACK_STATUS{
-        RUNNING(1,"运行中"),
+        INIT(10,"初始化"),
-        PAUSE(2,"暂停"),
+        WAIT(20,"等待中"),
-        FINISH(3,"完成");
+        RUNNING(30,"运行中"),
+        PAUSE(40,"手动暂停"),
+        FINISH(100,"执行完成"),
+        RUN_ERROR(101,"运行异常"),
+        RUN_STOP(102,"手动结束");
 
         private int value;
         private String description;

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

@@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean {
 
     @Column(name="STACK_SPEND")
     @ApiParam(value ="执行耗时")
-    private Integer stackSpend;
+    private Long stackSpend;
 
     @Column(name="STACK_STATUS")
     @ApiParam(value ="执行状态")
@@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
     private String executionDescription;
 
     @Transient
+    @ApiParam(value ="指令集模板")
+    private LacCommandStackTemplate template;
+
+    @Transient
     @ApiParam(value ="步骤列表")
     private List<LacCommandStackStep> stepList;
 

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

@@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean {
     @Transient
     @ApiParam(value ="步骤任务列表")
     private List<LacCommandStackStepTask> stepTaskList;
+
+
+    public LacCommandStackStep() {
+    }
+
+    public LacCommandStackStep(Long templateId) {
+        this.templateId = templateId;
+    }
 }

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

@@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long stepId;
 
+    /**
+     * 不建议使用
+     */
+    @Deprecated
     @Column(name="TASK_INSTANCE_ID")
     @ApiParam(value ="任务实例ID")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean {
     @Column(name="IS_CRUX")
     @ApiParam(value ="是否关键")
     private Integer isCrux;
+
     @Transient
     @ApiParam(value ="适配任务")
     private LacSuitTask lacSuitTask;
+
+    @Transient
+    @ApiParam(value ="适配任务记录")
+    private LacLogTask logTask;
+
+    public LacCommandStackStepTask() {
+    }
+
+    public LacCommandStackStepTask(Long templateId) {
+        this.templateId = templateId;
+    }
 }

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

@@ -32,6 +32,12 @@ import javax.persistence.Table;
 public class LacLogTask extends BaseBean {
 
     private static final long serialVersionUID = 674009105885048131L;
+
+    @Column(name="COMMAND_STACK_RECORD_ID")
+    @ApiParam(value ="指令集记录ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commandStackRecordId;
+
     @Column(name="commandStackId")
     @ApiParam(value ="指令集ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -50,6 +56,10 @@ public class LacLogTask extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long commandStackTypeId;
 
+    @Column(name="COMMAND_STACK_TYPE_NAME_RDD")
+    @ApiParam(value ="指令集类型名称")
+    private String commandStackTypeNameRdd;
+
     @Column(name="STEP_ID")
     @ApiParam(value ="步骤ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -61,7 +71,7 @@ public class LacLogTask extends BaseBean {
 
     @Column(name="STEP_SEQUENCE")
     @ApiParam(value ="步骤顺序")
-    private String stepSequence;
+    private Integer stepSequence;
 
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID" , example = "-1")
@@ -72,16 +82,25 @@ public class LacLogTask extends BaseBean {
     @ApiParam(value ="任务名称")
     private String taskNameRdd;
 
-    @Column(name="TASK_NAME_TYPE")
+    @Column(name="TASK_TYPE_ID")
     @ApiParam(value ="任务类型")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long taskNameType;
+    private Long taskTypeId;
+
+    @Column(name="TASK_TYPE_NAME_RDD")
+    @ApiParam(value ="任务类型")
+    private String taskTypeNameRdd;
 
     @Column(name="adapterId")
     @ApiParam(value ="适配器ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long adapterId;
 
+    @Column(name="TASK_DETAIL_ID")
+    @ApiParam(value ="任务执行记录明细" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskDetailId;
+
     @Lob
     @Column(name="INPUT_PARAMETER")
     @ApiParam(value ="任务入参")
@@ -97,10 +116,15 @@ public class LacLogTask extends BaseBean {
 
     @Column(name="TASK_SPEND")
     @ApiParam(value ="任务耗时")
-    private Integer taskSpend;
+    private Long taskSpend;
 
     @Column(name="TASK_STATUS")
     @ApiParam(value ="任务状态")
     private Integer taskStatus;
 
+    @Column(name="EXECUTION_DESCRIPTION")
+    @ApiParam(value ="执行说明")
+    private String executionDescription;
+
+
 }

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

@@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean {
 
 
     private static final long serialVersionUID = -4918694502072594064L;
+
+    @Column(name="COMMAND_STACK_RECORD_ID")
+    @ApiParam(value ="指令集记录ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commandStackRecordId;
+
     @Column(name="commandStackId")
     @ApiParam(value ="指令集ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -53,6 +59,11 @@ public class LacLogTaskDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
+    @Column(name="TASK_TYPE_ID")
+    @ApiParam(value ="任务类型")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskTypeId;
+
     @Column(name="TASK_NAME_TYPE")
     @ApiParam(value ="任务类型")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -71,6 +82,10 @@ public class LacLogTaskDetail extends BaseBean {
     @ApiParam(value ="任务结束时间")
     private String taskEndTime;
 
+    @Column(name="TASK_SPEND")
+    @ApiParam(value ="任务耗时")
+    private Long taskSpend;
+
     @Lob
     @Column(name="INPUT_PARAMETER")
     @ApiParam(value ="任务入参")
@@ -91,4 +106,9 @@ public class LacLogTaskDetail extends BaseBean {
     @ApiParam(value ="任务出参处理后")
     private String outputParameterBody;
 
+    @Lob
+    @Column(name="OUTPUT_PARAMETER_BODY")
+    @ApiParam(value ="任务执行异常信息")
+    private String errorMessage;
+
 }

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

@@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean {
     @ApiParam(value ="任务描述")
     private String taskDescription;
 
+    /********************************** 虚拟字段 **********************************/
+
     @Transient
     @ApiParam(value ="适配套件")
     private LacSuitCase lacSuitCase;
@@ -128,10 +130,6 @@ public class LacSuitTask extends BaseBean {
     private Long taskInstanceId;
 
     @Transient
-    @ApiParam(value ="适配参数")
-    private List<LacSuitTaskParam> lacSuitTaskParamList;
-
-    @Transient
     @ApiParam(value ="适配原始参数")
     private Object orginParam;
 
@@ -148,6 +146,10 @@ public class LacSuitTask extends BaseBean {
     private Object transMessage;
 
     @Transient
+    @ApiParam(value ="适配参数")
+    private List<LacSuitTaskParam> lacSuitTaskParamList;
+
+    @Transient
     @ApiParam(value ="入参适配")
     private List<LacSuitTaskParamAdapter> inputParamAdapterList;
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.lac.bean.*;
 
+import java.util.List;
+
 /**
  * @Description :
  * @Reference :
@@ -32,6 +34,75 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List<Long> idList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ;
+
+        DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List<Long> taskIdList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean);
+
+        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List<Long> taskIdList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean);
+
+        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+
         return ddlPackBean;
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -432,15 +432,11 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
-        }
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean);
-        if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean);
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
-        }
-        if (mesConfig.getIsValid() != null) {
-            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
-        }
         return packBean;
     }
 
@@ -1399,8 +1395,9 @@ public class MesHqlPack {
     }
 
     /**
-<<<<<<< Updated upstream
+     * <<<<<<< Updated upstream
      * MES 缺陷查询条件封装
+     *
      * @param mesDefect
      * @param organizeCode
      * @return
@@ -1421,6 +1418,7 @@ public class MesHqlPack {
 
     /**
      * MES 产品类型图片查询条件封装
+     *
      * @param mesProduceCtgyPicture
      * @param organizeCode
      * @return
@@ -1440,7 +1438,9 @@ public class MesHqlPack {
     }
 
 
-    /** 设备通知对象配置 查询条件封装
+    /**
+     * 设备通知对象配置 查询条件封装
+     *
      * @param mesEquNotifyObjectCfg
      * @param organizeCode
      * @return
@@ -1462,7 +1462,9 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /** 设备作业通知配置  查询条件封装
+    /**
+     * 设备作业通知配置  查询条件封装
+     *
      * @param mesEquTaskNotifyCfg
      * @param organizeCode
      * @return
@@ -1489,6 +1491,7 @@ public class MesHqlPack {
 
     /**
      * MES 类型信息查询条件封装
+     *
      * @param mesTypeCfg
      * @param organizeCode
      * @return
@@ -1512,6 +1515,7 @@ public class MesHqlPack {
 
     /**
      * MES 缺陷原因查询条件封装
+     *
      * @param mesDefectCause
      * @param organizeCode
      * @return
@@ -1532,6 +1536,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询mes设备点检保养维修作业
+     *
      * @param mesEquTaskDetail
      * @param organizeCode
      * @return
@@ -1555,6 +1560,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询首检件配置信息
+     *
      * @param mesFiCfg
      * @param organizeCode
      * @return
@@ -1575,6 +1581,7 @@ public class MesHqlPack {
 
     /**
      * 维修记录
+     *
      * @param mesEquTaskRepairRecord
      * @param organizeCode
      * @return
@@ -1589,6 +1596,7 @@ public class MesHqlPack {
 
     /**
      * 点检或保养记录
+     *
      * @param mesEquTaskStandardRecord
      * @param organizeCode
      * @return