Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java

@@ -50,10 +50,6 @@ public class AndonActionModule extends BaseBean implements Serializable {
     @ApiParam("组件类型")
     private Integer amType;
 
-    @Column(name = "INTERFACE_NO")
-    @ApiParam("界面编号")
-    private String interfaceNo;
-
     @Transient
     @ApiParam("执行顺序")
     private Integer seq;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java

@@ -40,7 +40,7 @@ public class AndonActor extends BaseBean implements Serializable {
     private String actorName;
 
     @Column(name = "ACTOR_Class")
-    @ApiParam("actor名称")
+    @ApiParam("actor类名")
     private String actorClass;
 
 

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTOR_RULE")
 @EqualsAndHashCode(callSuper = true)
-@Api("ACTOR消息获取规则")
+@Api("ACTOR消息类型配置")
 public class AndonActorRule extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 3244584643305867326L;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java

@@ -24,7 +24,7 @@ import java.io.Serializable;
 @Entity
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "PTL_ROUTE_MODULE_PARAM")
+@Table(name = "ANDON_ROUTE_MODULE_PARAM")
 @EqualsAndHashCode(callSuper = true)
 @Api("流程组件参数")
 public class AndonRouteModuleParam extends BaseBean implements Serializable {

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java

@@ -76,6 +76,14 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     @ApiParam("状态类型")
     private Integer statusType;
 
+    @Column(name = "INTERFACE_NO")
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @Transient
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
     @Transient
     @ApiParam("默认不缓存")
     private boolean cacheFlag = false;
@@ -85,7 +93,7 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("触发类型默认不需要外部触发")
     private boolean checkTriggerTypeFalg = false;
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.andon.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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4046192879130584866L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    public String andonOrderNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "失败描述")
+    public String errorDesc;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    public String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作中心")
+    public String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    public String alarmCode;
+
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java

@@ -60,12 +60,18 @@ public class AndonRouteStatusModel implements Serializable {
     @ApiParam("流程类型")
     private Integer routeType;
 
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
     public AndonRouteStatusModel() {
     }
 
     public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType,
-                                 String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId,
+                                 String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, Integer statusType,
-                                 Integer statusType, String alarmCode, String workCenterCode, Integer routeType) {
+                                 String interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) {
         this.routeCode = routeCode;
         this.statusCode = statusCode;
         this.statusName = statusName;
@@ -77,8 +83,10 @@ public class AndonRouteStatusModel implements Serializable {
         this.inAmgId = inAmgId;
         this.outAmgId = outAmgId;
         this.statusType = statusType;
+        this.interfaceNo = interfaceNo;
         this.alarmCode = alarmCode;
         this.workCenterCode = workCenterCode;
         this.routeType = routeType;
+        this.alarmRouteId = alarmRouteId;
     }
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -39,8 +39,10 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("当前流程状态")
     private AndonRouteStatus curRouteStatus;
 
-    @ApiModelProperty("外部触发事件")
+    @ApiModelProperty("触发事件")
     private String triggerEvent;
 
+    @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent")
+    private String nextTriggerEvent;
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleParamRepository extends BaseRepository<AndonActionModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleRepository extends BaseRepository<AndonActionModule, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmRouteModuleParamRepository extends BaseRepository<AndonAlarmRouteModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-14:24
+ * @Modify:
+ **/
+@Repository
+public interface IAndonMessageTypeRepository extends BaseRepository<AndonMessageType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository<AndonRouteStatusErrorRecord, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteStatusRepository extends BaseRepository<AndonRouteStatus, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import org.springframework.util.StringUtils;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description : 安灯对象查询封装
@@ -62,7 +57,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
-        if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){
+        if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
         return packBean;
@@ -209,7 +204,7 @@ public class AndonHqlPack {
     public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
 
         // 判断工厂代码是否为空
-        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
@@ -373,7 +368,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean);
 
-        if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){
+        if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
 
@@ -418,7 +413,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
-        if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
+        if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
         getStringBuilderPack(andonManageQueue, result);
@@ -557,10 +552,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
-        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }
         packBean.setOrderByStr(mesEquipment.orderBy());
@@ -575,13 +570,13 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
-        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+        if (!StringUtils.isEmpty(shift.getShiftCode())){
             DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getShiftName())){
+        if (!StringUtils.isEmpty(shift.getShiftName())){
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+        if (!StringUtils.isEmpty(shift.getWorkCenterCode())){
             DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
@@ -876,4 +871,121 @@ public class AndonHqlPack {
         DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
         return result;
     }
+
+    /**
+     * actor信息
+     * @param actor
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode);
+        if (!StringUtils.isEmpty(actor.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorName())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorClass())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 消息类型
+     * @param messageType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode);
+        if (!StringUtils.isEmpty(messageType.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean);
+        }
+        if (!StringUtils.isEmpty(messageType.getMtName())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * actor消息类型配置
+     * @param actorRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode);
+        if (!StringUtils.isEmpty(actorRule.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actorRule.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 安灯类型
+     * @param alarmType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode);
+        if (!StringUtils.isEmpty(alarmType.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(alarmType.getAlarmName())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件
+     * @param actionModule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode);
+        if (!StringUtils.isEmpty(actionModule.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmName())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getCallClass())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmType())) {
+            DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件参数
+     * @param actionModuleParam
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode);
+        if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamType())) {
+            DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -13,22 +13,29 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
-     * 流程状态-触发类型
+     * 状态点界面编号
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_TRIGGER_TYPE {
+    public enum ANDON_ROUTE_STATUS_INTERFACE_NO {
-        INNER_TRIGGER(10, "内部触发"),
+        EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"),
-        OUTER_TRIGGER(20, "外部触发");
+        QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
+        PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
+        ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"),
+        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"),
+        FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"),
+        ALARM_SIGN("ALARM_SIGN", "响应弹框界面"),
+        ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"),
+        ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面");
 
-        private int value;
+        private String value;
         private String description;
 
-        ROUTE_TRIGGER_TYPE(int value, String description) {
+        ANDON_ROUTE_STATUS_INTERFACE_NO(String value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public int getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -38,20 +45,21 @@ public class AndonEnumUtil {
     }
 
     /**
-     * 组件状态类型
+     * 组件参数类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_STATUS_TYPE {
+    public enum ACTION_MODULE_PARAM_TYPE {
-        START(10, "START", "开始状态"),
+
-        EXECUTING(20, "EXECUTING", "执行中状态"),
+        QUALIFIED(10, "number", "数字"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
+        DEFECTED(20, "text", "字符串"),
-        FINISH(40, "FINISH", "完成状态");
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
 
         private int value;
         private String code;
         private String description;
 
-        ROUTE_STATUS_TYPE(int value, String code, String description) {
+        ACTION_MODULE_PARAM_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -68,16 +76,24 @@ public class AndonEnumUtil {
         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 ACTION_MODULE_AM_TYPE {
-
+        COMMON_MODULE(10, "通用组件");
-        METHOD_MODULE(10, "方法组件"),
-        INTERFACE_MODULE(20, "界面组件");
 
         private int value;
         private String description;
@@ -94,15 +110,63 @@ public class AndonEnumUtil {
         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) {
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-                    tmp = values()[i].description;
+    public enum ROUTE_TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        ROUTE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
         }
+
+        public int getValue() {
+            return value;
         }
-            return tmp;
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
         }
     }
 
@@ -831,21 +895,23 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_TAG {
-        CALL(1,"10","呼叫"),
+        CALL(1, "1","10","呼叫"),
-        SIGN(2,"20","响应"),
+        SIGN(2, "2","20","响应"),
-        RESOLVE(3,"30","解决"),
+        RESOLVE(3, "3","30","解决"),
-        CANCEL(4,"40", "撤销"),
+        CANCEL(4, "4","40", "撤销"),
-        COMMIT(5,"50","解决待审"),
+        COMMIT(5, "5","50","解决待审"),
-        PASS(6,"60","审批完成"),
+        PASS(6, "6","60","审批完成"),
-        REJECT(7,"70","驳回"),
+        REJECT(7, "7","70","驳回"),
-        CONFIRMED_CANCEL(8,"80","撤销已确认");
+        CONFIRMED_CANCEL(8, "8","80","撤销已确认");
 
         private int value;
+        private String valueStr;
         private String code;
         private String description;
 
-        ANDON_ACTION_TAG(int value, String code, String description) {
+        ANDON_ACTION_TAG(int value, String valueStr, String code, String description) {
             this.value = value;
+            this.valueStr = valueStr;
             this.code = code;
             this.description = description;
         }
@@ -854,6 +920,8 @@ public class AndonEnumUtil {
             return value;
         }
 
+        public String getValueStr(){ return valueStr; }
+
         public String getCode(){ return code; }
 
         public String getDescription() {
@@ -869,6 +937,15 @@ public class AndonEnumUtil {
             return null;
         }
 
+        public static ANDON_ACTION_TAG getByValueStr(String valueStr) {
+            for (ANDON_ACTION_TAG actionTag : values()) {
+                if (actionTag.getValueStr().equals(valueStr)) {
+                    return actionTag;
+                }
+            }
+            return null;
+        }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {