Merge branch 'dev' into test

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

@@ -50,7 +50,6 @@ public class MesEnumUtil {
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_PCN_TASK_STATUS {
@@ -115,7 +114,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -932,15 +931,15 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10,"number", "数字"),
-        DEFECTED(20, "text","字符串"),
-        SCRAPED(30,"select", "可选值");
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值");
 
         private int value;
         private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value,String code, String description) {
+        STEP_PARAM_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -950,7 +949,9 @@ public class MesEnumUtil {
             return value;
         }
 
-        public String getCode(){return code;}
+        public String getCode() {
+            return code;
+        }
 
         public String getDescription() {
             return description;
@@ -1039,8 +1040,14 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath"),
-        NGINX_IP(20, "nginxIp");
+        FASTDFS_SAVE_PATH(10, "SAVE_PATH"),
+        NGINX_IP(20, "NGINX_HOST"),
+        MES_STATION_SOCKET(30, "mes_station_socket"),
+        GATEWAY_IP(40, "GATEWAY_HOST"),
+        UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
+        PCN_PULL(60, "PCN_PULL"),
+        PCN_PUSH(70, "PCN_PUSH"),
+        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD");
 
         private int value;
         private String description;
@@ -1112,7 +1119,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPANY_TYPE {
-        RULECODE("ruleCode","规则编码"),
+        RULECODE("ruleCode", "规则编码"),
         PREFIX("prefix", "前缀"),
         PART_NO("partNo", "物料号"),
         CUST_PART_NO("custPartNo", "客户物料号"),