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

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

@@ -164,7 +164,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "SC_RESPONSE_CODE")
     @ApiParam(value = "转呼响应方式")
-    private String scObjectCode;
+    private String scResponseCode;
 
     @Column(name = "SC_RP_LEVEL")
     @ApiParam(value = "转呼通知等级")
@@ -226,6 +226,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "响应时长", example = "0")
     private Long signTime;
 
+    @Column(name = "SEND_FLAG")
+    @ApiParam(value = "发送标志")
+    private String sendFlag;
+
     // 是否转呼
     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

@@ -153,7 +153,7 @@ public class AndonManageRecord extends BaseBean {
 
     @Column(name = "SC_RESPONSE_CODE")
     @ApiParam(value = "转呼响应方式")
-    private String scObjectCode;
+    private String scResponseCode;
 
     @Column(name = "SC_RP_LEVEL")
     @ApiParam(value = "转呼通知等级")

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

@@ -3,6 +3,7 @@ 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.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import org.apache.commons.lang3.StringUtils;
@@ -306,4 +307,22 @@ public class AndonHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 通知配置信息封装
+     * @param responseCfg
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
+        DdlPreparedPack.getNotInPackString(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()),
+                "rpLevel", result);
+
+        getStringBuilderPack(responseCfg, result);
+
+        return result;
+    }
 }