开发主动升级和启动产线业务

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

@@ -256,6 +256,33 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "发送标志")
     private String sendFlag;
 
+    /**
+     * 处理类型：10=标准处理，20=自处理
+     */
+    @Column(name = "DISPOSAL_TYPE")
+    @ApiParam(value = "处理类型")
+    private String disposalType;
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯子类型代码")
+    private String alarmDetailCode;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME_RDD")
+    @ApiParam(value = "事件现象描述")
+    private String epmNameRdd;
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME_RDD")
+    @ApiParam(value = "重要等级名称")
+    private String importanceNameRdd;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -225,6 +225,37 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "停机具体原因")
     private String haltDesc;
 
+    @Column(name = "SEND_FLAG")
+    @ApiParam(value = "发送标志")
+    private String sendFlag;
+
+    /**
+     * 处理类型：10=标准处理，20=自处理
+     */
+    @Column(name = "DISPOSAL_TYPE")
+    @ApiParam(value = "处理类型")
+    private String disposalType;
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯子类型代码")
+    private String alarmDetailCode;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME_RDD")
+    @ApiParam(value = "事件现象描述")
+    private String epmNameRdd;
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME_RDD")
+    @ApiParam(value = "重要等级名称")
+    private String importanceNameRdd;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_子类型数据操作层）
+ * @Reference :
+ * @Author : sililter.yuan
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmDetailTypeRepository extends BaseRepository<AndonAlarmDetailType, Long> {
+}

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

@@ -365,4 +365,20 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 安灯子类型信息封装
+     * @param andonAlarmDetailType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
+
+        getStringBuilderPack(andonAlarmDetailType, result);
+
+        return result;
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -57,7 +58,8 @@ public class AndonEnumUtil {
         ALARM_FLAG("10","安灯呼叫标识"),
         USER_CODE("20","用户工号"),
         READ_FLAG("30", "安灯读取状态"),
-        STOP_FLAG("40", "停线状态");
+        STOP_FLAG("40", "停线状态"),
+        DETAIL_TYPE("50", "安灯子类型");
 
         private String value;
         private String description;
@@ -214,6 +216,16 @@ public class AndonEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**