问题清单问题修复

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;

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;
 }

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(){

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;
 }

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;

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;
+        }
     }