From c1949e099c084ce6060a0cbe538a1f971690c637 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 18:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=89=E7=81=AF=E5=91=BC?= =?UTF-8?q?=E5=8F=AB=E5=8D=87=E7=BA=A7=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 6 +++++- .../bean/AndonManageRecord.java | 2 +- .../sqlpack/AndonHqlPack.java | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 0d455ec..6be6a9e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/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; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 5148f5a..fcc6d64 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/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 = "转呼通知等级") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 543a790..31dd513 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/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; + } }