安灯导出实体注解

定时任务日志添加字段

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

@@ -47,6 +47,10 @@ public class AndonDisposalCfg extends BaseBean {
     @ApiParam(value = "呼叫原因代码")
     private String acCode;
 
+    @Column(name = "AC_NAME_RDD")
+    @ApiParam(value = "呼叫原因描述")
+    private String acNameRdd;
+
     @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
     @Column(name = "APPROVAL_STATUS")
     @ApiParam(value = "审批状态")

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

@@ -297,6 +297,24 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "重要等级名称")
     private String importanceNameRdd;
 
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称")
+    private String organizeNameRdd;
+
+    /**
+     * 1 = 是，2 = 否
+     */
+    @Column(name = "IS_RESOLVE")
+    @ApiParam(value = "是否驳回", example = "2")
+    private Integer isResolve;
+
+    @Column(name = "RESOLVE_OPINION")
+    @ApiParam(value = "驳回意见")
+    private String resolveOpinion;
+
+    @Transient
+    @ApiParam(value = "安灯状态集合")
+    private List<String> statusCodeList;
 
     // 是否转呼
     public Integer getIsShiftCall() {
@@ -368,7 +386,10 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+        this.organizeCode = organizeCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
         this.resetUser = resetUser;
         this.alarmCode = alarmCode;
         this.callTime = callTime;
@@ -398,6 +419,18 @@ public class AndonManageQueue extends BaseBean {
     public AndonManageQueue() {
     }
 
+    /**
+     * 安灯问题情况报表
+     * @param organizeNameRdd
+     * @param workCenterNameRdd
+     * @param andonCount
+     */
+    public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) {
+        this.organizeNameRdd = organizeNameRdd;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.andonCount = andonCount;
+    }
+
     public static void main(String[] args) {
         try {
             List ds = new ArrayList();

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

@@ -245,9 +245,12 @@ public class AndonHqlPack {
 
         getStringBuilderPack(andonManageRecord, result);
 
-        // 根据优先级倒序，序号升序排序
-        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
-                new String[]{"priorityLevel", "seq"}, result);
+//        // 根据优先级倒序，序号升序排序
+//        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
+//                new String[]{"priorityLevel", "seq"}, result);
+        // 信息时间排序
+        DdlPreparedPack.getOrderDefault(andonManageRecord);
+        result.setOrderByStr(andonManageRecord.orderBy());
 
         return result;
     }
@@ -514,6 +517,11 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
         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);
 
         return result;
@@ -530,6 +538,8 @@ public class AndonHqlPack {
         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);
 
         getStringBuilderPack(plc, result);
         return result;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -61,7 +61,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="ORGANIZE_CODE")
     @ApiParam(value ="组织代码")
-    @AnnoOutputColumn(hidden = true)
+//    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
     @Column(name="IS_VALID")

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

@@ -212,7 +212,8 @@ public class AndonEnumUtil {
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销"),
         COMMIT(5,"50","提交"),
-        PASS(6,"60","审批");
+        PASS(6,"60","审批"),
+        REJECT(7,"70","驳回");
 
         private int value;
         private String code;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -36,6 +36,18 @@ import javax.persistence.Table;
 @Api(value="定时任务执行日志",description = "定时任务执行记录")
 public class SysLogTaskTime extends BaseBean {
 
+    @Column(name="SCHEDULER_INSTANCE_ID")
+    @ApiParam(value ="调度器实例id")
+    private String schedulerInstanceId;
+
+    @Column(name="SCHEDULER_SERVER_IP")
+    @ApiParam(value ="调度服务器ip")
+    private String schedulerServerIp;
+
+    @Column(name="SCHEDULER_SERVER_PORT")
+    @ApiParam(value ="调度服务器端口")
+    private String schedulerServerPort;
+
     @Column(name="NAME")
     @ApiParam(value ="任务名称")
     private String name;