From 8ace0c363d430002c153ba6e21dcdb8ca673ebdc Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Thu, 12 Mar 2020 17:08:33 +0800
Subject: [PATCH] ptl enum

---
 .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java  | 125 ++-------------------
 .../estsh/i3plus/pojo/ptl/model/LightOnModel.java  |   3 +
 2 files changed, 12 insertions(+), 116 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 6c75133..3dfb805 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -927,6 +927,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * PTL_区段亮灯任务明细状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
@@ -956,67 +959,11 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * PTL_区段亮灯任务明细状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TASK_DETAIL_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成");
-
-        private int value;
-        private String code;
-        private String description;
-
-        TASK_DETAIL_STATUS(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        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);
-        }
-    }
-
-    /**
-     * PTL_区段、区域亮灯任务状态
+     * PTL_区段亮灯任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
         CREATE(10, "CREATE", "新建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
 
         private int value;
@@ -1525,64 +1472,10 @@ public class PtlPcnEnumUtil {
             return valueOf(val);
         }
     }
-    /**
-     * 区域任务状态(ASN,PO,MOVE,QC)
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MASTER_ORDER_STATUS {
-        CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "IN_PROGRESS", "处理中"),
-        RECEIPT_FINISH(30, "COMPLETED", "已完成"),
-        CANCELLED(40, "CANCELLED", "已取消");
 
-        private int value;
-        private String code;
-        private String description;
 
-        MASTER_ORDER_STATUS(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        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);
-        }
-    }
     /**
-     * 区域任务类型(ASN,PO,MOVE,QC)
+     * 区段任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_TYPE {
@@ -1636,14 +1529,14 @@ public class PtlPcnEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
-     * 区域任务状态(ASN,PO,MOVE,QC)
+     * 区域任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_STATUS {
         CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "IN_PROGRESS", "处理中"),
-        RECEIPT_FINISH(30, "COMPLETED", "已完成");
+        RECEIPT_FINISH(30, "COMPLETED", "完成");
 
         private int value;
         private String code;
@@ -1693,7 +1586,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 区域任务类型(ASN,PO,MOVE,QC)
+     * 区域任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_TYPE {
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
index 7dd41d4..32bbe43 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
@@ -44,4 +44,7 @@ public class LightOnModel implements Serializable {
     @ApiParam("是否熄灯")
     private Integer lightFlag;
 
+    @ApiParam("状态")
+    private Integer status;
+
 }