From 7d8b8664cc7350b23fe9f5e2859970601801a54a Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Sat, 26 Oct 2019 19:42:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/andon/bean/AndonAlarmCause.java    |  5 ++-
 .../pojo/andon/bean/AndonAlarmDetailType.java      |  6 ++--
 .../pojo/andon/bean/AndonCellAlarmCause.java       |  8 ++---
 .../pojo/andon/bean/AndonCellEventCause.java       |  7 ++--
 .../pojo/andon/bean/AndonCellEventMethod.java      |  8 ++---
 .../i3plus/pojo/andon/bean/AndonEventCause.java    |  5 ++-
 .../i3plus/pojo/andon/bean/AndonEventMethod.java   |  5 ++-
 .../pojo/andon/bean/AndonEventPhenoMenon.java      |  2 ++
 .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java  |  6 ++--
 .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java    | 38 ++++++++--------------
 .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java   |  2 +-
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
index 0f46e3b..749eae4 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
@@ -28,7 +28,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api("ANDON_呼叫原因")
+@Api(value = "ANDON_呼叫原因")
 public class AndonAlarmCause extends BaseBean {
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@@ -40,6 +40,7 @@ public class AndonAlarmCause extends BaseBean {
     @ApiParam(value = "呼叫原因代码")
     private String acCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Column(name = "PARENT_AC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentAcCode;
@@ -48,10 +49,12 @@ public class AndonAlarmCause extends BaseBean {
     @ApiParam(value = "呼叫原因描述")
     private String acName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作中心")
     private String workCenterCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作单元")
     private String workCellCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
index b92a876..1ec4182 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
@@ -31,15 +31,15 @@ import javax.persistence.Table;
 public class AndonAlarmDetailType extends BaseBean {
 
     @Column(name = "ALARM_DETAIL_CODE")
-    @ApiParam(value = "安灯类型代码")
+    @ApiParam(value = "安灯子类型编码")
     private String alarmDetailCode;
 
     @Column(name = "ALARM_DETAIL_NAME")
-    @ApiParam(value = "安灯类型名称")
+    @ApiParam(value = "安灯子类型名称")
     private String alarmDetailName;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型代码")
+    @ApiParam(value = "安灯类型")
     private String alarmCode;
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
index 87b497a..d79eb4b 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
@@ -29,22 +29,20 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元呼叫原因配置")
 public class AndonCellAlarmCause extends BaseBean {
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
+    @ApiParam(value = "工位代码")
     private String workCellCode;
 
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
 
     @Column(name = "AC_CODE")
-    @ApiParam(value = "呼叫原因代码")
+    @ApiParam(value = "事件描述")
     private String acCode;
-
-
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
index afef3d0..4f04613 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,15 +35,16 @@ public class AndonCellEventCause extends BaseBean {
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
+    @ApiParam(value = "工位代码")
     private String workCellCode;
 
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
 
     @Column(name = "EC_CODE")
-    @ApiParam(value = "事件原因代码")
+    @ApiParam(value = "事件原因")
     private String ecCode;
 
 
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
index 2553c7c..b2f933c 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
@@ -29,22 +29,20 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元处理方法配置")
 public class AndonCellEventMethod extends BaseBean {
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
+    @ApiParam(value = "工位代码")
     private String workCellCode;
 
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
 
     @Column(name = "EM_CODE")
-    @ApiParam(value = "事件方法代码")
+    @ApiParam(value = "处理方法")
     private String emCode;
-
-
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
index f5f0469..2491043 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
@@ -28,7 +28,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api("ANDON_事件原因")
+@Api(value = "ANDON_事件原因")
 public class AndonEventCause extends BaseBean {
 
     @Column(name = "EC_CODE")
@@ -41,6 +41,7 @@ public class AndonEventCause extends BaseBean {
 
     @Column(name = "PARENT_EC_CODE")
     @ApiParam(value = "父阶原因代码")
+    @AnnoOutputColumn(hidden = true)
     private String parentEcCode;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@@ -50,9 +51,11 @@ public class AndonEventCause extends BaseBean {
 
     @Transient
     @ApiParam(value = "工作中心")
+    @AnnoOutputColumn(hidden = true)
     private String workCenterCode;
 
     @Transient
     @ApiParam(value = "工作单元")
+    @AnnoOutputColumn(hidden = true)
     private String workCellCode;
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
index ccd2315..f681bb6 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
@@ -28,7 +28,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api("ANDON_事件处理方法")
+@Api(value = "ANDON_事件处理方法")
 public class AndonEventMethod extends BaseBean {
 
     @Column(name = "EM_CODE")
@@ -39,6 +39,7 @@ public class AndonEventMethod extends BaseBean {
     @ApiParam(value = "事件方法描述")
     private String emName;
 
+    @AnnoOutputColumn(hidden = true)
     @Column(name = "PARENT_EM_CODE")
     @ApiParam(value = "父阶方法代码")
     private String parentEmCode;
@@ -48,10 +49,12 @@ public class AndonEventMethod extends BaseBean {
     @ApiParam(value = "安灯类型")
     private String alarmCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作中心")
     private String workCenterCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作单元")
     private String workCellCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
index 0580ab0..43877a3 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
@@ -44,10 +44,12 @@ public class AndonEventPhenoMenon extends BaseBean {
     @ApiParam(value = "安灯类型")
     private String alarmCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作中心")
     private String workCenterCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "工作单元")
     private String workCellCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
index 748105e..c18cf07 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
@@ -36,7 +36,7 @@ public class AndonPLC extends BaseBean {
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
+    @ApiParam(value = "工位代码")
     private String workCellCode;
 
     @Column(name = "NODE_CODE")
@@ -52,7 +52,7 @@ public class AndonPLC extends BaseBean {
     private String channelName;
 
     @Column(name = "TAG_NAME")
-    @ApiParam(value = "标签名称")
+    @ApiParam(value = "标签名字")
     private String tagName;
 
     @Column(name = "TAG_ADDRESS")
@@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean {
 
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     @Column(name = "IS_ALARM_STATUS")
-    @ApiParam(value = "是否按灯状态", example = "1")
+    @ApiParam(value = "是否按灯", example = "1")
     private Integer isAlarmStatus;
 
     public int getIsAlarmStatusVal(){
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 15572d5..dd08d20 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
@@ -279,13 +279,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
         DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
-
         getStringBuilderPack(andonAlarmCause, result);
-
         return result;
     }
 
@@ -296,10 +293,8 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonEventMethod, result);
-
         return result;
     }
 
@@ -310,10 +305,8 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonEventCause, result);
-
         return  result;
     }
 
@@ -365,7 +358,6 @@ public class AndonHqlPack {
         if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
-
         getStringBuilderPack(andonManageQueue, result);
         // 根据优先级倒序，序号升序排序
 //        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
@@ -627,9 +619,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
         DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
         DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
-
         getStringBuilderPack(andonResponseObject, result);
-
         return result;
     }
 
@@ -640,13 +630,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
         DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
-
         getStringBuilderPack(andonEventCause, result);
-
         return result;
     }
 
@@ -673,6 +660,11 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result);
         DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result);
         DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
+                new String[]{eventPhenoMenon.getOrderByParam()},
+                result
+        );
 
         getStringBuilderPack(eventPhenoMenon, result);
 
@@ -681,18 +673,15 @@ public class AndonHqlPack {
 
     /**
      * ANDON_ 事件处理方法
-     * @param eventPhenoMenon
+     * @param eventMethod
      * @return
      */
-    public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
+    public static DdlPackBean packAndonEventMethod(AndonEventMethod eventMethod) {
         DdlPackBean result = new DdlPackBean();
-
-        DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
-        DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result);
-        DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result);
-
-        getStringBuilderPack(eventPhenoMenon, result);
-
+        DdlPreparedPack.getStringEqualPack(eventMethod.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(eventMethod.getEmName(), "emName", result);
+        DdlPreparedPack.getStringLikerPack(eventMethod.getEmCode(), "emCode", result);
+        getStringBuilderPack(eventMethod, result);
         return result;
     }
 
@@ -703,13 +692,14 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonPLC(AndonPLC plc) {
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
         DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
         DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result);
         DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result);
-
+        DdlPreparedPack.getStringEqualPack(plc.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(plc.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(plc, result);
         return result;
     }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 5ed2462..3950979 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED")

From 6902c794721baa273159f10fd13816e2ce08b67c Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Sun, 27 Oct 2019 11:51:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java   | 11 ++++++-----
 .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java     | 11 ++++++-----
 .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java   |  8 ++++----
 .../cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java  |  6 +++---
 .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java |  3 +--
 .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java     | 10 ++++++++++
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
index a6824e0..e0bbc8e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
@@ -32,16 +32,16 @@ public class AndonAlarmResponseCfg extends BaseBean {
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型代码")
+    @ApiParam(value = "安灯类型")
     private String alarmCode;
 
-    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
     @Column(name = "ANDON_STATUS")
     @ApiParam(value = "安灯状态")
     private String andonStatus;
 
     @Column(name = "RP_WHERE")
-    @ApiParam(value = "通知条件时长")
+    @ApiParam(value = "通知时间")
     private String rpWhere;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@@ -50,7 +50,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
     private String rpCode;
 
     @Column(name = "RP_OBJECT_CODE")
-    @ApiParam(value = "通知对象代码")
+    @ApiParam(value = "通知对象")
     private String rpObjectCode;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
@@ -59,9 +59,10 @@ public class AndonAlarmResponseCfg extends BaseBean {
     private String rpLevel;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam(value = "工作中心代码")
+    @ApiParam(value = "工作中心")
     private String workCenterCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Column(name = "WORK_CENTER_NAME_RDD")
     @ApiParam(value = "工作中心名称")
     private String workCenterNameRdd;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
index 819f768..9f8d287 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
@@ -37,24 +37,24 @@ public class AndonDisposalCfg extends BaseBean {
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
+    @ApiParam(value = "工位代码")
     private String workCellCode;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型代码")
+    @ApiParam(value = "安灯类型")
     private String alarmCode;
 
     @Column(name = "AC_CODE")
-    @ApiParam(value = "呼叫原因代码")
+    @ApiParam(value = "事件描述编码")
     private String acCode;
 
     @Column(name = "AC_NAME_RDD")
-    @ApiParam(value = "呼叫原因描述")
+    @ApiParam(value = "事件描述名称")
     private String acNameRdd;
 
     @Column(name = "EM_CODE")
-    @ApiParam(value = "事件方法代码")
+    @ApiParam(value = "处理方法")
     private String emCode;
 
     @Column(name = "EM_NAME_RDD")
@@ -72,5 +72,6 @@ public class AndonDisposalCfg extends BaseBean {
 
     @Transient
     @ApiParam(value = "审批意见集合")
+    @AnnoOutputColumn(hidden = true)
     private Integer[] flowStatusArray;
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
index c18cf07..2a8d9ad 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
@@ -32,7 +32,7 @@ import javax.persistence.Table;
 public class AndonPLC extends BaseBean {
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam(value = "工作中心代码")
+    @ApiParam(value = "工作中心")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
@@ -40,7 +40,7 @@ public class AndonPLC extends BaseBean {
     private String workCellCode;
 
     @Column(name = "NODE_CODE")
-    @ApiParam(value = "控制节点代码")
+    @ApiParam(value = "控制节点编码")
     private String nodeCode;
 
     @Column(name = "NODE_IP")
@@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean {
     @ApiParam(value = "分组号")
     private String groupNo;
 
-    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+//    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
@@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean {
 
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     @Column(name = "IS_ALARM_STATUS")
-    @ApiParam(value = "是否按灯", example = "1")
+    @ApiParam(value = "是否安灯")
     private Integer isAlarmStatus;
 
     public int getIsAlarmStatusVal(){
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
index fda0737..9cdb336 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
@@ -29,14 +29,14 @@ import javax.persistence.Table;
 public class AndonResponseObject extends BaseBean {
 
     @Column(name = "RP_OBJECT_CODE")
-    @ApiParam(value = "对象代码")
+    @ApiParam(value = "通知对象对象编码")
     private String rpObjectCode;
 
     @Column(name = "RP_OBJECT_NAME")
-    @ApiParam(value = "对象名称")
+    @ApiParam(value = "通知对象名称")
     private String rpObjectName;
 
     @Column(name = "RP_OBJECT_VALUE")
-    @ApiParam(value = "对象值")
+    @ApiParam(value = "通知对象值")
     private String rpObjectValue;
 }
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 dd08d20..5d13427 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
@@ -533,14 +533,13 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) {
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result);
-
+        DdlPreparedPack.getStringEqualPack(responseCfg.getRpCode(), "rpCode", result);
         getStringBuilderPack(responseCfg, result);
 
         return result;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 230f235..bbd3eb5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -453,6 +453,16 @@ public class AndonEnumUtil {
             }
             return tmp;
         }
+
+        public static String descriptionOfCode(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
     }
 
 

From 4eaa8b5b177a35769f6cea9d7103afbcd1acefad Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Sun, 27 Oct 2019 12:26:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java    | 2 +-
 .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
index 962309b..3c89d14 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
@@ -29,7 +29,7 @@ import javax.persistence.Table;
 public class AndonHaltType extends BaseBean {
 
     @Column(name = "HALT_CODE")
-    @ApiParam(value = "停机类型代码")
+    @ApiParam(value = "停机类型编码")
     private String haltCode;
 
     @Column(name = "HALT_NAME")
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 3950979..08085ad 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -74,7 +74,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "是否已删除",example = "2")
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
-    public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSE
+    public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
 
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")

From 1e0f0c706cb37934bd447f3390907965e164dacc Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Sun, 27 Oct 2019 17:40:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/andon/bean/AndonKnowledgeBase.java |  1 -
 .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java  |  4 +-
 .../pojo/andon/bean/AndonResponseObject.java       |  7 +++
 .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java    | 17 +++++++
 .../i3plus/pojo/base/enumutil/AndonEnumUtil.java   | 52 ++++++++++++++++++++++
 5 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
index 835046b..ff4853d 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
@@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue {
     @Column(name = "FLOW_MEMO")
     @ApiParam(value = "审批意见")
     private String flowMemo;
-
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
index 2a8d9ad..828a12a 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
@@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean {
     @ApiParam(value = "分组号")
     private String groupNo;
 
-//    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
@@ -77,7 +77,7 @@ public class AndonPLC extends BaseBean {
     @ApiParam(value = "标签业务类型")
     private String tagBusinessType;
 
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.IS_ALARM_STATUS.class,refForeignKey = "value",value = "description")
     @Column(name = "IS_ALARM_STATUS")
     @ApiParam(value = "是否安灯")
     private Integer isAlarmStatus;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
index 9cdb336..b2ad1a2 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 安灯通知对象
@@ -39,4 +41,9 @@ public class AndonResponseObject extends BaseBean {
     @Column(name = "RP_OBJECT_VALUE")
     @ApiParam(value = "通知对象值")
     private String rpObjectValue;
+
+    @AnnoOutputColumn(hidden = true)
+    @Transient
+    @ApiParam(value = "通知对象")
+    private String rpObjectValueRdd;
 }
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 5d13427..547a389 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
@@ -341,6 +341,23 @@ public class AndonHqlPack {
      * @param andonManageQueue
      * @return
      */
+    public static DdlPackBean packHqlAndonManageQueueUseByPlc(AndonManageQueue andonManageQueue, Object[] obj){
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
+        DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonManageQueue, result);
+        return result;
+    }
+
+    /**
+     * 按条件查询按灯队列信息
+     * @param andonManageQueue
+     * @return
+     */
     public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index bbd3eb5..b27a4a3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -292,6 +292,58 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 处理标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_ALARM_STATUS {
+        TRUE(10, "是"), FALSE(20, "否");
+
+        private int value;
+        private String description;
+
+        private IS_ALARM_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {return valueOf(val);}
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
+    }
+
+
+    /**
      * 按灯状态
      * 10-是，20-否
      */