Merge remote-tracking branch 'origin/master'

hzims-biz-common/src/main/java/com/hnac/hzims/common/config/RedisMessageConfig.java

@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicLong;
 public class RedisMessageConfig implements ApplicationRunner {
 
 	/**AtomicLong 可以理解为加了synchronized的long类型**/
-	private AtomicLong counter = new AtomicLong(0);
+	private final AtomicLong counter = new AtomicLong(0);
 
 	@Autowired
 	private ApplicationContext context;

hzims-biz-common/src/main/java/com/hnac/hzims/common/constant/DateConstant.java

@@ -11,7 +11,8 @@ import java.util.Optional;
  */
 public interface DateConstant {
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum UnitEnum {
 		YEAR("year","年"),
 		MONTH("month","月"),
@@ -21,7 +22,6 @@ public interface DateConstant {
 		SECOND("second","秒")
 		;
 
-		@Getter
 		private String unit;
 		@Getter
 		private String describe;

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/annotation/OperationAnnotation.java

@@ -45,7 +45,7 @@ public @interface OperationAnnotation {
 	/**
 	 * 是否保存响应的参数
 	 */
-	public boolean isSaveResponseData() default true;
+    boolean isSaveResponseData() default true;
 
 	/**
 	 * 功能说明

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java

@@ -172,7 +172,7 @@ public class SysLogAspect {
         for (StackTraceElement stet : elements) {
             strbuff.append(stet + "\n");
         }
-        String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString();
+        String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff;
         return message;
     }
 

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/consumer/SysLogConsumer.java

@@ -34,7 +34,7 @@ public class SysLogConsumer implements Runnable {
     /**
      * 批次数
      */
-    private int batchSize = DEFAULT_BATCH_SIZE;
+    private final int batchSize = DEFAULT_BATCH_SIZE;
 
     @Autowired
     private SysLogFeignService sysLogFeignService;

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/consumer/SysLogQueue.java

@@ -20,7 +20,7 @@ public class SysLogQueue {
     /**
      * BlockingDequeue为双端阻塞队列，blockingQueue阻塞队列
      */
-    private BlockingQueue<SysLogTo> blockingQueue = new LinkedBlockingQueue<>();
+    private final BlockingQueue<SysLogTo> blockingQueue = new LinkedBlockingQueue<>();
 
     /**
      * 存入数据

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/enums/BusinessStatus.java

@@ -8,6 +8,7 @@ import lombok.Getter;
  * @author ruoyi
  *
  */
+@Getter
 public enum BusinessStatus
 {
     /**
@@ -20,11 +21,10 @@ public enum BusinessStatus
      */
     FAIL(1,"执行异常");
 
-    @Getter
+    private final Integer key;
-    private Integer key;
 
     @Getter
-    private String value;
+    private final String value;
 
     BusinessStatus(Integer key,String value){
         this.key = key;

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/enums/BusinessType.java

@@ -8,6 +8,7 @@ import lombok.Getter;
  * 
  * @author ruoyi
  */
+@Getter
 public enum BusinessType
 {
     /**
@@ -60,11 +61,10 @@ public enum BusinessType
      */
     CLEAN("CLEAN","清空数据");
 
-    @Getter
+    private final String key;
-    private String key;
 
     @Getter
-    private String value;
+    private final String value;
 
     BusinessType(String key,String value){
         this.key = key;

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/enums/OperatorType.java

@@ -7,6 +7,7 @@ import lombok.Getter;
  * 
  * @author ruoyi
  */
+@Getter
 public enum OperatorType
 {
     /**
@@ -29,11 +30,10 @@ public enum OperatorType
     APPSYSTEMS("APPSYSTEMS","app端");
 
 
-    @Getter
+    private final String key;
-    private String key;
 
     @Getter
-    private String value;
+    private final String value;
 
 
     OperatorType(String key,String value){

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/text/CharsetKit.java

@@ -21,9 +21,9 @@ public class CharsetKit
     public static final String GBK = "GBK";
 
     /** ISO-8859-1 */
-    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
     /** UTF-8 */
-    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
     /** GBK */
     public static final Charset CHARSET_GBK = Charset.forName(GBK);
 

hzims-biz-common/src/main/java/com/hnac/hzims/common/support/constants/Order.java

@@ -1,5 +1,5 @@
 package com.hnac.hzims.common.support.constants;
 
 public enum Order {
-    ASC,DESC;
+    ASC,DESC
 }

hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/CacheUtil.java

@@ -29,11 +29,11 @@ public class CacheUtil {
 	public StringRedisTemplate stringRedisTemplate;
 
 	/**String 锁**/
-	private Lock stringLock = new ReentrantLock();
+	private final Lock stringLock = new ReentrantLock();
 	/**hash 锁**/
-	private Lock hashLock = new ReentrantLock();
+	private final Lock hashLock = new ReentrantLock();
 	/**zSet 锁**/
-	private Lock zSetLock = new ReentrantLock();
+	private final Lock zSetLock = new ReentrantLock();
 
 	/**
 	 * redis String类型容错机制处理 超出容错机制自动删除

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/AssetsConstants.java

@@ -5,14 +5,14 @@ import lombok.Getter;
 public class AssetsConstants {
 	public final static String APP_NAME = "hzims-assets";
 
-	public enum TaskTypeEnum{
+	@Getter
+    public enum TaskTypeEnum{
 		MANUAL("1","手动"),
 		AUTO("2","自动")
 		;
+		private final String type;
 		@Getter
-		private String type;
+		private final String describe;
-		@Getter
-		private String describe;
 
 
 		TaskTypeEnum(String type, String describe) {
@@ -24,7 +24,8 @@ public class AssetsConstants {
 	/**
 	 * 周期类型
 	 */
-	public enum CycleTypeEnum {
+	@Getter
+    public enum CycleTypeEnum {
 		/**
 		 * 秒
 		 */
@@ -53,11 +54,10 @@ public class AssetsConstants {
 		 *  年
 		 */
 		YEAR_CYCLE(6,"年");
+		private final int type;
 		@Getter
-		private int type;
+		private final String name;
-		@Getter
+		CycleTypeEnum(int type, String name){
-		private String name;
-		private CycleTypeEnum(int type,String name){
 			this.type = type;
 			this.name = name;
 		}
@@ -67,7 +67,8 @@ public class AssetsConstants {
 	/**
 	 * 取数规则
 	 */
-	public enum AccessRulesEnum {
+	@Getter
+    public enum AccessRulesEnum {
 		/**
 		 *  最早值
 		 */
@@ -96,11 +97,10 @@ public class AssetsConstants {
 		 *  最后值
 		 */
 		FINAL_CYCLE(6,"最后值");
+		private final int type;
 		@Getter
-		private int type;
+		private final String name;
-		@Getter
+		AccessRulesEnum(int type, String name){
-		private String name;
-		private AccessRulesEnum(int type,String name){
 			this.type = type;
 			this.name = name;
 		}
@@ -110,17 +110,17 @@ public class AssetsConstants {
 	/**
 	 * 装机容量
 	 */
-	public enum MainEnum {
+	@Getter
+    public enum MainEnum {
 		/**
 		 *  装机容量
 		 */
 		INSTALLED_CAPACITY("installedCapacity","装机容量");
 
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
+		MainEnum(String val, String name){
-		private String name;
-		private MainEnum(String val,String name){
 			this.val = val;
 			this.name = name;
 		}
@@ -129,17 +129,17 @@ public class AssetsConstants {
 	/**
 	 * 运行状态
 	 */
-	public enum RunStatus {
+	@Getter
+    public enum RunStatus {
 		run("1","运行中"),
 		spare("2","热备用"),
 		access("0","检修"),
 		;
+		private final String status;
 		@Getter
-		private String status;
+		private final String des;
-		@Getter
-		private String des;
 
-		private RunStatus(String status, String des) {
+		RunStatus(String status, String des) {
 			this.status = status;
 			this.des = des;
 		}
@@ -149,7 +149,8 @@ public class AssetsConstants {
 	/**
 	 * 装机容量
 	 */
-	public enum SignageEnum {
+	@Getter
+    public enum SignageEnum {
 		/**
 		 *  发电标识
 		 */
@@ -163,11 +164,10 @@ public class AssetsConstants {
 		 */
 		JOINT_RELAY_SIGNAGE_SIGNAGE("joint_relay","合位继电器");
 
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
+		SignageEnum(String val, String name){
-		private String name;
-		private SignageEnum(String val,String name){
 			this.val = val;
 			this.name = name;
 		}

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/constants/AssetsConstant.java

@@ -11,33 +11,33 @@ public interface AssetsConstant {
     /**
      * 工单记录生成使用系统名称
      */
-    final String TICKET_SYSTEM_USE_NAME = "系统";
+    String TICKET_SYSTEM_USE_NAME = "系统";
 
     /**
      * 工单记录生成使用系统名称
      */
-    final BigDecimal TICKET_INITIAL_COEFFICIENT  = new BigDecimal("1.0");
+    BigDecimal TICKET_INITIAL_COEFFICIENT  = new BigDecimal("1.0");
 
     /**
      * 常量1
      */
-    final String TICKET_ONE = "1";
+    String TICKET_ONE = "1";
 
     /**
      * 常量2
      */
-    final String TICKET_ZRE = "0";
+    String TICKET_ZRE = "0";
     /**
      * 常量4
      */
-    final String TICKET_FOR = "4";
+    String TICKET_FOR = "4";
     /**
      * 常量
      */
-    final String YES = "YES";
+    String YES = "YES";
 
     /**
      * 工单数量缓存
      */
-    final String TICKET_DAY_NUM = "hzims:assets";
+    String TICKET_DAY_NUM = "hzims:assets";
 }

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/enume/BusinessType.java

@@ -1,26 +1,21 @@
 package com.hnac.hzims.spare.enume;
 
+import lombok.Getter;
+
 /**
  * 单据类型
  */
+@Getter
 public enum BusinessType {
     IN(1, "入库"), OUT(2, "出库"), ALLOT(3, "调拨"), RECEIVE(4, "领用"), RETURNED(5, "归还"),RETURN(6,"退回");
 
     private int type;
     private String name;
 
-    public int getType() {
-        return type;
-    }
-
     public void setType(int type) {
         this.type = type;
     }
 
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/enume/WarehouseInType.java

@@ -1,26 +1,21 @@
 package com.hnac.hzims.spare.enume;
 
+import lombok.Getter;
+
 /**
  * 入库类型
  */
+@Getter
 public enum WarehouseInType {
     BUY(1,"购买入库"),BACK(2,"退回入库"),ALLOT(3,"调拨入库"),OLD(4,"旧品入库");
 
     private int type;
     private String name;
 
-    public int getType() {
-        return type;
-    }
-
     public void setType(int type) {
         this.type = type;
     }
 
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/enume/WarehouseOutType.java

@@ -1,26 +1,21 @@
 package com.hnac.hzims.spare.enume;
 
+import lombok.Getter;
+
 /**
  * 出库类型
  */
+@Getter
 public enum WarehouseOutType {
     MAINTENANCE(1,"维保出库"),REPAIR(2,"维修出库"),ALLOT(3,"调拨出库"),OTHER(4,"其他");
 
     private int type;
     private String name;
 
-    public int getType() {
-        return type;
-    }
-
     public void setType(int type) {
         this.type = type;
     }
 
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/cache/CaffeineCacheUtil.java

@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
 public class CaffeineCacheUtil {
 
     //创建guava cache
-    private static Cache<String, Report> loadingCache = Caffeine.newBuilder()
+    private static final Cache<String, Report> loadingCache = Caffeine.newBuilder()
             //cache的初始容量
             .initialCapacity(5)
             //cache最大缓存数
@@ -24,7 +24,7 @@ public class CaffeineCacheUtil {
             //.expireAfterAccess(17, TimeUnit.SECONDS)
             .build();
 
-    private static Cache<String, YearReport> loadingYearCache = Caffeine.newBuilder()
+    private static final Cache<String, YearReport> loadingYearCache = Caffeine.newBuilder()
             //cache的初始容量
             .initialCapacity(5)
             //cache最大缓存数
@@ -35,7 +35,7 @@ public class CaffeineCacheUtil {
             //.expireAfterAccess(17, TimeUnit.SECONDS)
             .build();
 
-    private static Cache<String, List<Map<String,Object>>> loadingMapCache = Caffeine.newBuilder()
+    private static final Cache<String, List<Map<String,Object>>> loadingMapCache = Caffeine.newBuilder()
             //cache的初始容量
             .initialCapacity(5)
             //cache最大缓存数

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/Report.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.entity;
 
 import com.hnac.hzims.enums.QueryDateTypeEnum;
 import com.hnac.hzims.util.ReportDateUtil;
+import lombok.Getter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.text.SimpleDateFormat;
@@ -14,6 +15,7 @@ import java.util.*;
  * @Author: liugang
  * @Date: 2019/7/8 15:03
  */
+@Getter
 public class Report {
 
     /**
@@ -241,26 +243,14 @@ public class Report {
         }
     }
 
-    public List<Map<String, String>> getTitle() {
-        return title;
-    }
-
     public void setTitle(List<Map<String, String>> title) {
         this.title = title;
     }
 
-    public List<ReportUnit> getData() {
-        return data;
-    }
-
     public void setData(List<ReportUnit> data) {
         this.data = data;
     }
 
-    public List<ReportUnit> getStandardData() {
-        return standardData;
-    }
-
     public void setStandardData(List<ReportUnit> standardData) {
         this.standardData = standardData;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/ReportData.java

@@ -1,5 +1,7 @@
 package com.hnac.hzims.entity;
 
+import lombok.Getter;
+
 /**
  * 封装一个key,value键值对象
  * 可能是数据库返回查询数据
@@ -11,50 +13,41 @@ package com.hnac.hzims.entity;
  */
 public class ReportData {
 
+    @Getter
     private String keyStr;
 
+    @Getter
     private String keyDate;
 
+    @Getter
     private String val;
     //测站  或  属性
+    @Getter
     private String stcd;
     //属性名
+    @Getter
     private String name;
 
     private Double value;
 
+    @Getter
     private int month=-1;
 
+    @Getter
     private String day;
 
-    public String getDay() {
-        return day;
-    }
-
     public void setDay(String day) {
         this.day = day;
     }
 
-    public int getMonth() {
-        return month;
-    }
-
     public void setMonth(int month) {
         this.month = month;
     }
 
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }
 
-    public String getStcd() {
-        return stcd;
-    }
-
     public void setStcd(String stcd) {
         this.stcd = stcd;
     }
@@ -62,10 +55,6 @@ public class ReportData {
     public ReportData() {
     }
 
-    public String getKeyDate() {
-        return keyDate;
-    }
-
     public void setKeyDate(String keyDate) {
         this.keyDate = keyDate;
     }
@@ -75,18 +64,10 @@ public class ReportData {
         this.val = val;
     }
 
-    public String getKeyStr() {
-        return keyStr;
-    }
-
     public void setKeyStr(String keyStr) {
         this.keyStr = keyStr;
     }
 
-    public String getVal() {
-        return val;
-    }
-
     public void setVal(String val) {
         this.val = val;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/ReportUnit.java

@@ -1,8 +1,11 @@
 package com.hnac.hzims.entity;
 
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
 public class ReportUnit {
     private String key;
 
@@ -16,18 +19,10 @@ public class ReportUnit {
         }
     }
 
-    public String getKey() {
-        return key;
-    }
-
     public void setKey(String key) {
         this.key = key;
     }
 
-    public List<String> getDataList() {
-        return dataList;
-    }
-
     public void setDataList(List<String> dataList) {
         this.dataList = dataList;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/StandardData.java

@@ -1,10 +1,12 @@
 package com.hnac.hzims.entity;
 
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Objects;
 
+@Getter
 public class StandardData {
     public static final String STANDARD_AVG = "时刻平均值";
     public static final String STANDARD_MAX = "时刻最大值";
@@ -116,58 +118,30 @@ public class StandardData {
         }
     }
 
-    public String getDataAvg() {
-        return dataAvg;
-    }
-
     public void setDataAvg(String dataAvg) {
         this.dataAvg = dataAvg;
     }
 
-    public String getDataMax() {
-        return dataMax;
-    }
-
     public void setDataMax(String dataMax) {
         this.dataMax = dataMax;
     }
 
-    public String getDataMaxDate() {
-        return dataMaxDate;
-    }
-
     public void setDataMaxDate(String dataMaxDate) {
         this.dataMaxDate = dataMaxDate;
     }
 
-    public String getDataMin() {
-        return dataMin;
-    }
-
     public void setDataMin(String dataMin) {
         this.dataMin = dataMin;
     }
 
-    public String getDataMinDate() {
-        return dataMinDate;
-    }
-
     public void setDataMinDate(String dataMinDate) {
         this.dataMinDate = dataMinDate;
     }
 
-    public String getAmplitude() {
-        return amplitude;
-    }
-
     public void setAmplitude(String amplitude) {
         this.amplitude = amplitude;
     }
 
-    public String getDataSum() {
-        return dataSum;
-    }
-
     public void setDataSum(String dataSum) {
         this.dataSum = dataSum;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/YearReport.java

@@ -3,12 +3,14 @@ package com.hnac.hzims.entity;
 
 
 import com.hnac.hzims.util.ReportDateUtil;
+import lombok.Getter;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+@Getter
 public class YearReport {
     private static final int MAX_DAY = 31;
 
@@ -136,42 +138,22 @@ public class YearReport {
         return temp;
     }
 
-    public int getYear() {
-        return year;
-    }
-
     public void setYear(int year) {
         this.year = year;
     }
 
-    public String getStcd() {
-        return stcd;
-    }
-
     public void setStcd(String stcd) {
         this.stcd = stcd;
     }
 
-    public List<List<String>> getDayList() {
-        return dayList;
-    }
-
     public void setDayList(List<List<String>> dayList) {
         this.dayList = dayList;
     }
 
-    public List<ReportUnit> getMonthList() {
-        return monthList;
-    }
-
     public void setMonthList(List<ReportUnit> monthList) {
         this.monthList = monthList;
     }
 
-    public List<ReportData> getYearList() {
-        return yearList;
-    }
-
     public void setYearList(List<ReportData> yearList) {
         this.yearList = yearList;
     }

hzims-service-api/common-api/src/main/java/com/hnac/hzims/enums/QueryDateTypeEnum.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.enums;
 
+import lombok.Getter;
+
+@Getter
 public enum QueryDateTypeEnum {
     //时
     HOUR("hour"),
@@ -25,10 +28,6 @@ public enum QueryDateTypeEnum {
         return null;
     }
 
-    public String getQueryDateType() {
-        return queryDateType;
-    }
-
     public void setQueryDateType(String queryDateType) {
         this.queryDateType = queryDateType;
     }

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/EquipmentConstants.java

@@ -6,14 +6,14 @@ import lombok.Getter;
 public class EquipmentConstants {
 	public final static String APP_NAME = "hzims-equipment";
 
-	public enum TaskTypeEnum{
+	@Getter
+    public enum TaskTypeEnum{
 		MANUAL("1","手动"),
 		AUTO("2","自动")
 		;
+		private final String type;
 		@Getter
-		private String type;
+		private final String describe;
-		@Getter
-		private String describe;
 
 
 		TaskTypeEnum(String type, String describe) {
@@ -25,7 +25,8 @@ public class EquipmentConstants {
 	/**
 	 * 周期类型
 	 */
-	public enum CycleTypeEnum {
+	@Getter
+    public enum CycleTypeEnum {
 		/**
 		 * 秒
 		 */
@@ -54,11 +55,10 @@ public class EquipmentConstants {
 		 *  年
 		 */
 		YEAR_CYCLE(6,"年");
+		private final int type;
 		@Getter
-		private int type;
+		private final String name;
-		@Getter
+		CycleTypeEnum(int type, String name){
-		private String name;
-		private CycleTypeEnum(int type,String name){
 			this.type = type;
 			this.name = name;
 		}
@@ -68,7 +68,8 @@ public class EquipmentConstants {
 	/**
 	 * 取数规则
 	 */
-	public enum AccessRulesEnum {
+	@Getter
+    public enum AccessRulesEnum {
 		/**
 		 *  最早值
 		 */
@@ -97,11 +98,10 @@ public class EquipmentConstants {
 		 *  最后值
 		 */
 		FINAL_CYCLE(6,"最后值");
+		private final int type;
 		@Getter
-		private int type;
+		private final String name;
-		@Getter
+		AccessRulesEnum(int type, String name){
-		private String name;
-		private AccessRulesEnum(int type,String name){
 			this.type = type;
 			this.name = name;
 		}
@@ -111,17 +111,17 @@ public class EquipmentConstants {
 	/**
 	 * 装机容量
 	 */
-	public enum MainEnum {
+	@Getter
+    public enum MainEnum {
 		/**
 		 *  装机容量
 		 */
 		INSTALLED_CAPACITY("installedCapacity","装机容量");
 
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
+		MainEnum(String val, String name){
-		private String name;
-		private MainEnum(String val,String name){
 			this.val = val;
 			this.name = name;
 		}
@@ -130,17 +130,17 @@ public class EquipmentConstants {
 	/**
 	 * 运行状态
 	 */
-	public enum RunStatus {
+	@Getter
+    public enum RunStatus {
 		run("1","正常"),
 		spare("2","备用"),
 		access("0","检修"),
 		;
+		private final String status;
 		@Getter
-		private String status;
+		private final String des;
-		@Getter
-		private String des;
 
-		private RunStatus(String status, String des) {
+		RunStatus(String status, String des) {
 			this.status = status;
 			this.des = des;
 		}
@@ -149,16 +149,16 @@ public class EquipmentConstants {
 	/**
 	 * 运行状态
 	 */
-	public enum ActivateStatusEnum {
+	@Getter
+    public enum ActivateStatusEnum {
 		stop(0,"停用"),
 		start(1,"启用")
 		;
+		private final Integer status;
 		@Getter
-		private Integer status;
+		private final String des;
-		@Getter
-		private String des;
 
-		private ActivateStatusEnum(Integer status, String des) {
+		ActivateStatusEnum(Integer status, String des) {
 			this.status = status;
 			this.des = des;
 		}
@@ -168,7 +168,8 @@ public class EquipmentConstants {
 	/**
 	 * 装机容量
 	 */
-	public enum SignageEnum {
+	@Getter
+    public enum SignageEnum {
 		/**
 		 *  发电标识
 		 */
@@ -182,11 +183,10 @@ public class EquipmentConstants {
 		 */
 		JOINT_RELAY_SIGNAGE_SIGNAGE("joint_relay","合位继电器");
 
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
+		SignageEnum(String val, String name){
-		private String name;
-		private SignageEnum(String val,String name){
 			this.val = val;
 			this.name = name;
 		}

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/constants/MonitorConstants.java

@@ -20,7 +20,8 @@ public interface MonitorConstants {
 	/**未绑定**/
 	String BANDING_STATUS_3 = "3";
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum TimeUnitEnum {
 		/**时**/
 		HOURS("hr", 2, ChronoUnit.HOURS),
@@ -29,7 +30,6 @@ public interface MonitorConstants {
 		/**秒**/
 		SECOND("sec", 0, ChronoUnit.SECONDS),
 		;
-		@Getter
 		private String fdpTimeUnit;
 
 		@Getter
@@ -46,7 +46,8 @@ public interface MonitorConstants {
 	}
 
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum TimeTypeEnum {
 		/**采样时刻点的实际值**/
 		CURRENT("current",6,"采样时刻点的实际值"),
@@ -59,7 +60,6 @@ public interface MonitorConstants {
 		/**采样间隔内的所有值的累加**/
 		SUM("sum",4,"采样间隔内的所有值的累加"),
 		;
-		@Getter
 		private String mode;
 		@Getter
 		private Integer timeType;
@@ -72,7 +72,8 @@ public interface MonitorConstants {
 		}
 	}
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum DataTypeEnum {
 		/**布尔值（单点）**/
 		BOOLEAN("bool[]"),
@@ -83,7 +84,6 @@ public interface MonitorConstants {
 		/**浮点值（多点）**/
 		FLOAT_ARRAY("float[][]")
 		;
-		@Getter
 		private String type;
 
 		public static DataTypeEnum getDataTypeEnumByType(String type) {

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmTreeNode.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.equipment.entity;
 
+import lombok.Getter;
+
 import java.io.Serializable;
 import java.util.List;
 
 
+@Getter
 public class EmTreeNode implements Serializable {
     private Object id;
     private Object parentId;
@@ -11,42 +14,22 @@ public class EmTreeNode implements Serializable {
     private Integer level;
     private List<? extends EmTreeNode> children;
 
-    public Object getId() {
-        return id;
-    }
-
     public void setId(Object id) {
         this.id = id;
     }
 
-	public Object getParentId() {
+    public void setParentId(Object parentId) {
-		return parentId;
-	}
-
-	public void setParentId(Object parentId) {
 		this.parentId = parentId;
 	}
 
-	public String getTitle() {
+    public void setTitle(String title) {
-		return title;
-	}
-
-	public void setTitle(String title) {
 		this.title = title;
 	}
 
-	public Integer getLevel() {
+    public void setLevel(Integer level) {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
 		this.level = level;
 	}
 
-	public List<? extends EmTreeNode> getChildren() {
-        return children;
-    }
-
     public void setChildren(List<? extends EmTreeNode> children) {
         this.children = children;}
 

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/constants/FdpConstant.java

@@ -16,7 +16,8 @@ public interface FdpConstant {
 	String SET_DEVICE_TYPE = "2";
 	/**-----------------------------------------------------------------------------------------**/
 
-	enum FdpTaskStatusEnum{
+    @Getter
+    enum FdpTaskStatusEnum{
 		/**
 		 *  未开始
 		 */
@@ -30,10 +31,9 @@ public interface FdpConstant {
 		 */
 		FINISH_STATUS(3,"已完成");
 
+		private final int status;
 		@Getter
-		private int status;
+		private final String msg;
-		@Getter
-		private String msg;
 
 		FdpTaskStatusEnum(int status,String msg){
 			this.status = status;

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/enums/ReadDataTypes.java

@@ -3,11 +3,11 @@ package com.hnac.hzims.fdp.enums;
 public class ReadDataTypes {
 
 
-	public static enum EYxTpye {
+	public enum EYxTpye {
 		yxOneBit,
 		yxTwoBit;
 
-		private EYxTpye() {
+		EYxTpye() {
 		}
 	}
 

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 @Slf4j
 public class HttpRequestUtil {
@@ -36,7 +37,7 @@ public class HttpRequestUtil {
 			 * 下面的三句代码，就是调用第三方http接口
 			 */
 			//获取URLConnection对象对应的输出流
-			out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+			out = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8);
 			//发送请求参数即数据
 			out.write(JSON.toJSONString(param));
 			//flush输出流的缓冲
@@ -103,7 +104,7 @@ public class HttpRequestUtil {
 			 * 下面的三句代码，就是调用第三方http接口
 			 */
 			//获取URLConnection对象对应的输出流
-			out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+			out = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8);
 			//发送请求参数即数据
 			out.write(JSON.toJSONString(param));
 			//flush输出流的缓冲

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/vo/YxRValueVo.java

@@ -1,9 +1,11 @@
 package com.hnac.hzims.fdp.vo;
 
 import com.hnac.hzims.fdp.enums.ReadDataTypes;
+import lombok.Getter;
 
 import java.util.Date;
 
+@Getter
 public class YxRValueVo {
 	public byte Value;
 	public short q;
@@ -14,27 +16,15 @@ public class YxRValueVo {
 	public YxRValueVo() {
 	}
 
-	public byte getValue() {
+    public void setValue(byte value) {
-		return this.Value;
-	}
-
-	public void setValue(byte value) {
 		this.Value = value;
 	}
 
-	public short getQ() {
+    public void setQ(short q) {
-		return this.q;
-	}
-
-	public void setQ(short q) {
 		this.q = q;
 	}
 
-	public Date getTime() {
+    public void setTime(Date time) {
-		return this.Time;
-	}
-
-	public void setTime(Date time) {
 		this.Time = time;
 	}
 }

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/monitor/entity/HisDataYc.java

@@ -1,34 +1,27 @@
 package com.hnac.hzims.monitor.entity;
 
+import lombok.Getter;
+
 import java.util.Date;
 
 public class HisDataYc {
-	private double val;
+	@Getter
-	private Date datatime;
+    private double val;
-	private int q;
+	@Getter
+    private Date datatime;
+	@Getter
+    private int q;
 	private int _msec;
 
-	public double getVal() {
+    public void setVal(double val) {
-		return val;
-	}
-
-	public void setVal(double val) {
 		this.val = val;
 	}
 
-	public Date getDatatime() {
+    public void setDatatime(Date datatime) {
-		return datatime;
-	}
-
-	public void setDatatime(Date datatime) {
 		this.datatime = datatime;
 	}
 
-	public int getQ() {
+    public void setQ(int q) {
-		return q;
-	}
-
-	public void setQ(int q) {
 		this.q = q;
 	}
 
@@ -61,14 +54,9 @@ public class HisDataYc {
 		}
 		HisDataYc other = (HisDataYc) obj;
 		if (datatime == null) {
-			if (other.datatime != null) {
+            return other.datatime == null;
-				return false;
+		} else return datatime.equals(other.datatime);
-			}
+    }
-		} else if (!datatime.equals(other.datatime)) {
-			return false;
-		}
-		return true;
-	}
 
 	@Override
 	public String toString() {

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/monitor/entity/HisDataYx.java

@@ -1,20 +1,19 @@
 package com.hnac.hzims.monitor.entity;
 
+import lombok.Getter;
+
 import java.util.Date;
 
+@Getter
 public class HisDataYx {
 	private int val;
 	private Date datatime;
-	public int getVal() {
+
-		return val;
+    public void setVal(int val) {
-	}
-	public void setVal(int val) {
 		this.val = val;
 	}
-	public Date getDatatime() {
+
-		return datatime;
+    public void setDatatime(Date datatime) {
-	}
-	public void setDatatime(Date datatime) {
 		this.datatime = datatime;
 	}
 	@Override

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/monitor/utils/DataGridModel.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.monitor.utils;
 
 
+import lombok.Getter;
+
 import java.io.Serializable;
 import java.util.List;
 
+@Getter
 public class DataGridModel<T> implements Serializable {
 	private static final long serialVersionUID = 8591890308861767849L;
 	private long total = 0L;
@@ -13,27 +16,15 @@ public class DataGridModel<T> implements Serializable {
 	public DataGridModel() {
 	}
 
-	public List<T> getFooter() {
+    public void setFooter(List<T> footer) {
-		return this.footer;
-	}
-
-	public void setFooter(List<T> footer) {
 		this.footer = footer;
 	}
 
-	public long getTotal() {
+    public void setTotal(long total) {
-		return this.total;
-	}
-
-	public void setTotal(long total) {
 		this.total = total;
 	}
 
-	public List<T> getRows() {
+    public void setRows(List<T> rows) {
-		return this.rows;
-	}
-
-	public void setRows(List<T> rows) {
 		this.rows = rows;
 	}
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java

@@ -12,7 +12,8 @@ public class OperationalConstants {
 	/**
 	 * 交接班类型
 	 */
-	public enum DutyRecTypeEnum {
+	@Getter
+    public enum DutyRecTypeEnum {
 		/**
 		 * 交班
 		 */
@@ -22,12 +23,11 @@ public class OperationalConstants {
 		 */
 		CARRY_REC(2, "接班");
 
+		private final int val;
 		@Getter
-		private int val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private DutyRecTypeEnum(int val, String name) {
+		DutyRecTypeEnum(int val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -36,7 +36,8 @@ public class OperationalConstants {
 	/**
 	 * 交接班类型
 	 */
-	public enum MessageRecTypeEnum {
+	@Getter
+    public enum MessageRecTypeEnum {
 		/**
 		 * 提前 15 分钟 提醒交班
 		 */
@@ -49,12 +50,11 @@ public class OperationalConstants {
 		DELAYED_HAND_REC_MESSAGE(1, "延时交班提醒"),
 		//最迟延迟交班提醒
 		DELAYED_HAND_REC_MESSAGE_LAST(15, "延时交班提醒");
+		private final int val;
 		@Getter
-		private int val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private MessageRecTypeEnum(int val, String name) {
+		MessageRecTypeEnum(int val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -63,7 +63,8 @@ public class OperationalConstants {
 	/**
 	 * 消息业务分类
 	 */
-	public enum MessageClassifyEnum {
+	@Getter
+    public enum MessageClassifyEnum {
 		/**
 		 * 系统通知
 		 */
@@ -85,12 +86,11 @@ public class OperationalConstants {
 		 */
 		MESSAGE_CNONE("none", "无");
 
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private MessageClassifyEnum(String val, String name) {
+		MessageClassifyEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -100,7 +100,8 @@ public class OperationalConstants {
 	/**
 	 * 交接班类型
 	 */
-	public enum RecTypeEnum {
+	@Getter
+    public enum RecTypeEnum {
 		/**
 		 * 交班提醒
 		 */
@@ -114,12 +115,11 @@ public class OperationalConstants {
 		 */
 		REMIND_HAND_PERSON(3, "提醒交班人交班");
 
+		private final int val;
 		@Getter
-		private int val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private RecTypeEnum(int val, String name) {
+		RecTypeEnum(int val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -129,7 +129,8 @@ public class OperationalConstants {
 	/**
 	 * 工作流状态
 	 */
-	public enum ProcessStatusEnum {
+	@Getter
+    public enum ProcessStatusEnum {
 		/**
 		 * 默认
 		 */
@@ -142,12 +143,11 @@ public class OperationalConstants {
 		 * 提醒交班人交班
 		 */
 		COMPLETED_PROCESS_STATUS(2, "已完成");
+		private final int val;
 		@Getter
-		private int val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private ProcessStatusEnum(int val, String name) {
+		ProcessStatusEnum(int val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -156,7 +156,8 @@ public class OperationalConstants {
 	/**
 	 * 数据类型
 	 */
-	public enum UserDataScopeTypeEnum {
+	@Getter
+    public enum UserDataScopeTypeEnum {
 		/**
 		 * 只看自己
 		 */
@@ -181,12 +182,11 @@ public class OperationalConstants {
 		 * 全部可见
 		 */
 		SELT_SUBORDINATE_BODY("5", "个人及下属机构");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private UserDataScopeTypeEnum(String val, String name) {
+		UserDataScopeTypeEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -196,7 +196,8 @@ public class OperationalConstants {
 	/**
 	 * 站点类型
 	 */
-	public enum StationTypeEnum {
+	@Getter
+    public enum StationTypeEnum {
 		/**
 		 * 水电站
 		 */
@@ -221,12 +222,11 @@ public class OperationalConstants {
 		 * 闸门
 		 */
 		GATE_STATION("6", "闸门");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private StationTypeEnum(String val, String name) {
+		StationTypeEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -236,7 +236,8 @@ public class OperationalConstants {
 	/**
 	 * 所属行业
 	 */
-	public enum TradeEnum {
+	@Getter
+    public enum TradeEnum {
 		/**
 		 * 水电站
 		 */
@@ -245,12 +246,11 @@ public class OperationalConstants {
 		 * 风电
 		 */
 		WATER_AFFAIRS_INDUSTRY("2", "水务行业");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private TradeEnum(String val, String name) {
+		TradeEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -260,7 +260,8 @@ public class OperationalConstants {
 	/**
 	 * 站点类型
 	 */
-	public enum StationQuantityEnum {
+	@Getter
+    public enum StationQuantityEnum {
 		/**
 		 * 水电站
 		 */
@@ -277,12 +278,11 @@ public class OperationalConstants {
 		 * 泵站
 		 */
 		WHOLE("4", "整");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private StationQuantityEnum(String val, String name) {
+		StationQuantityEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -291,7 +291,8 @@ public class OperationalConstants {
 	/**
 	 * 行业类型
 	 */
-	public enum InDustryEnum {
+	@Getter
+    public enum InDustryEnum {
 		/**
 		 * 系统
 		 */
@@ -308,12 +309,11 @@ public class OperationalConstants {
 		 * 单个站点类型
 		 */
 		SINGLE_STATION_TYPE("4", "单个站点类型");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private InDustryEnum(String val, String name) {
+		InDustryEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -323,7 +323,8 @@ public class OperationalConstants {
 	/**
 	 * 首页分类
 	 */
-	public enum FirstPageTypeEnum {
+	@Getter
+    public enum FirstPageTypeEnum {
 		/**
 		 * 系统
 		 */
@@ -335,12 +336,11 @@ public class OperationalConstants {
 		STATION("3", "站点数据总览"),
 		TOW("4", "两站数据总览"),
 		ONE("5", "单站数据总览");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private FirstPageTypeEnum(String val, String name) {
+		FirstPageTypeEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
@@ -350,7 +350,8 @@ public class OperationalConstants {
 	/**
 	 * 行业站点类型
 	 */
-	public enum BusinessStationTypeEnum {
+	@Getter
+    public enum BusinessStationTypeEnum {
 		/**
 		 * 行业
 		 */
@@ -363,17 +364,17 @@ public class OperationalConstants {
 		 * 单个站点分类
 		 */
 		SINGLE_STATION_TYPE("3", "单个站点分类");
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private BusinessStationTypeEnum(String val, String name) {
+		BusinessStationTypeEnum(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}
 	}
-	public enum DutyLogLevel {
+	@Getter
+    public enum DutyLogLevel {
 		/**
 		 * 水电站
 		 */
@@ -386,12 +387,11 @@ public class OperationalConstants {
 		/**
 		 * 泵站
 		 */
+		private final String val;
 		@Getter
-		private String val;
+		private final String name;
-		@Getter
-		private String name;
 
-		private DutyLogLevel(String val, String name) {
+		DutyLogLevel(String val, String name) {
 			this.val = val;
 			this.name = name;
 		}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/constants/AccessConstants.java

@@ -73,6 +73,7 @@ public interface AccessConstants {
 	String MESSAGE_BUSINESS_CLASSIFY = "access";//消息推送检修类型
 	String MESSAGE_ACCESS_TYPE = "7";//消息推送检修
 
+	@Getter
 	enum AccessProcessEnum{
 		ACCESS_CHARGE_APPROVAL("主管审核","accessManager","有一条检修任务待您审核，请及时处理"),
 		ACCESS_ADJUST_APPROVAL("调整计划","","您有一条检修计划审核未通过，请及时处理"),
@@ -80,12 +81,11 @@ public interface AccessConstants {
 		ACCESS_BACKLOG("生成任务","accessProprietor","有一条待您处理的检修任务生成，请及时处理"),
 		;
 
+		private final String status;
 		@Getter
-		private String status;
+		private final String role;
 		@Getter
-		private String role;
+		private final String msg;
-		@Getter
-		private String msg;
 
 		AccessProcessEnum(String status, String role, String msg) {
 			this.status = status;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/entity/DataSet.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.operational.config.entity;
 
+import lombok.Getter;
+
+@Getter
 public class DataSet implements Comparable<DataSet>{
     private Long id;
     private Integer propertyType;//类型，1-遥信；2-遥测
@@ -14,91 +17,47 @@ public class DataSet implements Comparable<DataSet>{
 	private String fdpFaultId;//fdp故障ID
 	private String fdpMonitorId;//fdp监测点ID
 
-    public Long getId() {
-        return id;
-    }
-
     public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getPropertyType() {
-        return propertyType;
-    }
-
     public void setPropertyType(Integer propertyType) {
         this.propertyType = propertyType;
     }
 
-    public String getRealId() {
-        return realId;
-    }
-
     public void setRealId(String realId) {
         this.realId = realId;
     }
 
-    public String getPropertyName() {
-        return propertyName;
-    }
-
     public void setPropertyName(String propertyName) {
         this.propertyName = propertyName;
     }
 
-    public String getValue() {
-        return value;
-    }
-
     public void setValue(String value) {
         this.value = value;
     }
 
-    public int getStatus() {
-        return status;
-    }
-
     public void setStatus(int status) {
         this.status = status;
     }
 
-    public int getQ() {
-        return q;
-    }
-
     public void setQ(int q) {
         this.q = q;
     }
 
-    public String getTime() {
-        return time;
-    }
-
     public void setTime(String time) {
         this.time = time;
     }
 
-	public Double getFdpRate() {
+    public void setFdpRate(Double fdpRate) {
-		return fdpRate;
-	}
-
-	public void setFdpRate(Double fdpRate) {
 		this.fdpRate = fdpRate;
 	}
 
-	public String getFdpFaultId() {
+    public void setFdpFaultId(String fdpFaultId) {
-		return fdpFaultId;
-	}
-
-	public void setFdpFaultId(String fdpFaultId) {
 		this.fdpFaultId = fdpFaultId;
 	}
 
-	public String getFdpMonitorId() {
+    public void setFdpMonitorId(String fdpMonitorId) {
-		return fdpMonitorId;
-	}
-
-	public void setFdpMonitorId(String fdpMonitorId) {
 		this.fdpMonitorId = fdpMonitorId;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/enume/ConfigStatus.java

@@ -10,7 +10,8 @@ public interface ConfigStatus {
 	 *
 	 * @author LiangXiang
 	 */
-	public enum ConfigStatusEnum {
+    @Getter
+    enum ConfigStatusEnum {
 		/**
 		 * 正常
 		 */
@@ -35,12 +36,11 @@ public interface ConfigStatus {
 		 * 告警
 		 */
 		HAND_DELAY_STATUS(5, "告警");
+		private final int status;
 		@Getter
-		private int status;
+		private final String name;
-		@Getter
-		private String name;
 
-		private ConfigStatusEnum(int status, String name) {
+		ConfigStatusEnum(int status, String name) {
 			this.status = status;
 			this.name = name;
 		}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/constants/DefectConstant.java

@@ -62,7 +62,8 @@ public interface DefectConstant {
 
 
 
-	enum HandlerStatusEnum{
+	@Getter
+    enum HandlerStatusEnum{
 		/**
 		 *  未处理
 		 */
@@ -71,17 +72,17 @@ public interface DefectConstant {
 		 *  已处理
 		 */
 		FINISH_STATUS("1","已处理");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		HandlerStatusEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
 		}
 	}
 
-	enum DiscrStatusEnum{
+	@Getter
+    enum DiscrStatusEnum{
 		/**
 		 *  未甄别
 		 */
@@ -90,10 +91,9 @@ public interface DefectConstant {
 		 *  已甄别
 		 */
 		FINISH_STATUS("1","已甄别");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		DiscrStatusEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
@@ -101,7 +101,8 @@ public interface DefectConstant {
 	}
 
 
-	enum AutoDiscrStatusEnum{
+	@Getter
+    enum AutoDiscrStatusEnum{
 		/**
 		 *  普通甄别
 		 */
@@ -110,17 +111,17 @@ public interface DefectConstant {
 		 *  自动甄别
 		 */
 		AUTO_STATUS("1","自动甄别");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		AutoDiscrStatusEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
 		}
 	}
 
-	enum IsDefectStatusEnum{
+	@Getter
+    enum IsDefectStatusEnum{
 		/**
 		 *  是否为缺陷，0 否，1是
 		 */
@@ -129,17 +130,17 @@ public interface DefectConstant {
 		 *  是否为缺陷，0 否，1是
 		 */
 		IS_DEFECT(1,"是缺陷");
+		private final Integer status;
 		@Getter
-		private Integer status;
+		private final String msg;
-		@Getter
-		private String msg;
 		IsDefectStatusEnum(Integer status,String msg){
 			this.status = status;
 			this.msg = msg;
 		}
 	}
 
-	enum ConclStatusEnum{
+	@Getter
+    enum ConclStatusEnum{
 		/**
 		 *  未定论
 		 */
@@ -148,10 +149,9 @@ public interface DefectConstant {
 		 *  已定论
 		 */
 		FINISH_STATUS("1","已定论");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		ConclStatusEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
@@ -159,7 +159,8 @@ public interface DefectConstant {
 	}
 
 
-	enum DefectHandlerStatusEnum{
+	@Getter
+    enum DefectHandlerStatusEnum{
 		/**
 		 *  处理中
 		 */
@@ -168,10 +169,9 @@ public interface DefectConstant {
 		 *  已完成
 		 */
 		FINISH_STATUS("1","已完成");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		DefectHandlerStatusEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
@@ -181,14 +181,14 @@ public interface DefectConstant {
 	/**
 	 * 缺陷等级
 	 */
-	enum DefectLevelEnum{
+    @Getter
+    enum DefectLevelEnum{
 		ONE("1","Ⅰ级缺陷"),
 		TWO("2","·"),
 		THREE("3","Ⅲ级缺陷");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		DefectLevelEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;
@@ -198,16 +198,16 @@ public interface DefectConstant {
 	/**
 	 * 问题来源:ZB:值班管理,RCWH:日常维护,XJ:巡检管理,JX:检修管理,ZNZD:智能诊断
 	 */
-	enum DefectSourceEnum{
+    @Getter
+    enum DefectSourceEnum{
 		ZB("ZB","值班管理"),
 		RCWH("RCWH","日常维护"),
 		XJ("XJ","巡检管理"),
 		JX("JX","检修管理"),
 		ZNZD("ZNZD","智能诊断");
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		DefectSourceEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/StatisticsFeignClient.java

@@ -35,5 +35,5 @@ public interface StatisticsFeignClient {
      * @return
      */
     @GetMapping("/defect_statistic/defectStatistictCount")
-    public  R<List<StatistictCountVo>> defectStatistictCount();
+    R<List<StatistictCountVo>> defectStatistictCount();
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/DutyContants.java

@@ -13,7 +13,8 @@ public interface DutyContants {
 	 * @author LiangXiang
 	 *
 	 */
-	public enum DutyRecDelayStatusEnum{
+    @Getter
+    enum DutyRecDelayStatusEnum{
 		/**
 		 *  延时状态：未延时
 		 */
@@ -30,9 +31,8 @@ public interface DutyContants {
 		 *  延时状态：交接班延时
 		 */
 		REC_DELAY_STATUS(3);
-		@Getter
+		private final int status;
-		private int status;
+		DutyRecDelayStatusEnum(int status){
-		private DutyRecDelayStatusEnum(int status){
 			this.status = status;
 		}
 	}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/enume/DutyMainStatus.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.operational.duty.enume;
 
+import lombok.Getter;
+
 /**
  * @Author: py
  * 交接班状态值
  */
+@Getter
 public enum DutyMainStatus {
 	UMSUBMIT(0,"待值班"),EXEC(1,"值班中"),ACCEPT(2,"已完成");
 	private Integer val;
@@ -14,19 +17,11 @@ public enum DutyMainStatus {
 		this.name = name;
 	}
 
-	public Integer getVal() {
+    public void setVal(Integer val) {
-		return val;
-	}
-
-	public void setVal(Integer val) {
 		this.val = val;
 	}
 
-	public String getName() {
+    public void setName(String name) {
-		return name;
-	}
-
-	public void setName(String name) {
 		this.name = name;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/enume/DutyRecStatus.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.operational.duty.enume;
 
+import lombok.Getter;
+
 /**
  * @Author: py
  * 交接班状态值
  */
+@Getter
 public enum DutyRecStatus {
 	UMSUBMIT(1,"未提交"),EXEC(2,"流程处理中"),ACCEPT(3,"已完成"),ANOMALY(4,"异常交接班");
 	private Integer val;
@@ -14,19 +17,11 @@ public enum DutyRecStatus {
 		this.name = name;
 	}
 
-	public Integer getVal() {
+    public void setVal(Integer val) {
-		return val;
-	}
-
-	public void setVal(Integer val) {
 		this.val = val;
 	}
 
-	public String getName() {
+    public void setName(String name) {
-		return name;
-	}
-
-	public void setName(String name) {
 		this.name = name;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/enume/DutyStatus.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.operational.duty.enume;
 
+import lombok.Getter;
+
 /**
  * @Author: py
  * 调班状态值
  */
+@Getter
 public enum DutyStatus {
 	UMSUBMIT(1,"未提交"),CHANGE(2,"调班人审批"),BEIN(3,"主管审批"),FINISH(4,"已完成"),NOTPASS(5,"驳回"),CLOSED(6,"已关闭");
 	private Integer val;
@@ -14,19 +17,11 @@ public enum DutyStatus {
 		this.name = name;
 	}
 
-	public Integer getVal() {
+    public void setVal(Integer val) {
-		return val;
-	}
-
-	public void setVal(Integer val) {
 		this.val = val;
 	}
 
-	public String getName() {
+    public void setName(String name) {
-		return name;
-	}
-
-	public void setName(String name) {
 		this.name = name;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/enume/JoinStatus.java

@@ -1,25 +1,21 @@
 package com.hnac.hzims.operational.duty.enume;
+
+import lombok.Getter;
+
 /**
  * 交接班状态
  */
+@Getter
 public enum JoinStatus {
 	DUTY_WAIT(0, "待值班"), DUTY_ING(1, "值班中"),DUTY_FINISH(2, "已完成");
 	private int status;
 	private String name;
 
-	public int getStatus() {
+    public void setStatus(int status) {
-		return status;
-	}
-
-	public void setStatus(int status) {
 		this.status = status;
 	}
 
-	public String getName() {
+    public void setName(String name) {
-		return name;
-	}
-
-	public void setName(String name) {
 		this.name = name;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/enume/JoinType.java

@@ -1,26 +1,21 @@
 package com.hnac.hzims.operational.duty.enume;
 
+import lombok.Getter;
+
 /**
  * 交接班类型
  */
+@Getter
 public enum JoinType {
 	OVER(1, "交班待提交"), START(2, "接班待确认"),FINISH(3,"已完成"),REJECT(4,"已驳回"),;
 	private int type;
 	private String name;
 
-	public int getType() {
+    public void setType(int type) {
-		return type;
-	}
-
-	public void setType(int type) {
 		this.type = type;
 	}
 
-	public String getName() {
+    public void setName(String name) {
-		return name;
-	}
-
-	public void setName(String name) {
 		this.name = name;
 	}
 	JoinType(int type, String name) {

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/MainEnumConstants.java

@@ -5,7 +5,8 @@ import lombok.Getter;
 public interface MainEnumConstants {
 
 
-	enum SoeKindEnum{
+	@Getter
+    enum SoeKindEnum{
 		/**
 		 *  系统告警
 		 */
@@ -71,17 +72,17 @@ public interface MainEnumConstants {
 		 *  用于初始化
 		 */
 		SOE_KIND_16(16,"用于初始化");
+		private final int status;
 		@Getter
-		private int status;
+		private final String value;
-		@Getter
+		SoeKindEnum(int status, String value){
-		private String value;
-		private SoeKindEnum(int status,String value){
 			this.status = status;
 			this.value = value;
 		}
 	}
 
-	enum TaskTypeEnum{
+	@Getter
+    enum TaskTypeEnum{
 		RCWH("RCWH","日常维护"),
 		XJ("XJ","巡检管理"),
 		JX("JX","检修管理"),
@@ -89,10 +90,9 @@ public interface MainEnumConstants {
 		GZP("GZP","工作票"),
 		CZP("CZP","操作票"),
 		;
+		private final String status;
 		@Getter
-		private String status;
+		private final String msg;
-		@Getter
-		private String msg;
 		TaskTypeEnum(String status,String msg){
 			this.status = status;
 			this.msg = msg;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java

@@ -25,6 +25,6 @@ public interface MaintenanceFeignClient {
 
     @PostMapping("/maintenance/findPending")
     @ApiOperation(value = "日常维护待处理")
-    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
+    Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
 
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/constants/ReportConstant.java

@@ -1,12 +1,15 @@
 package com.hnac.hzims.operational.report.constants;
 
+import lombok.Getter;
+
 public interface ReportConstant {
 
 	String MONTH_REPORT_TYPE_MAINTENANCE = "1";//日常维护
 	String MONTH_REPORT_TYPE_ACCESS = "2";//检修
 	String MONTH_REPORT_TYPE_INSPECT = "3";//巡检
 
-	enum RoleEnum{
+	@Getter
+    enum RoleEnum{
 		OPERATE_CREW("operatingCrew","运行人员"),
 		;
 
@@ -15,15 +18,8 @@ public interface ReportConstant {
 			this.name = name;
 		}
 
-		private String code;
+		private final String code;
-		private String name;
+		private final String name;
-
-		public String getCode() {
-			return code;
-		}
 
-		public String getName() {
+    }
-			return name;
-		}
-	}
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/StationConstants.java

@@ -29,12 +29,12 @@ public interface StationConstants {
 
 	String DATA_ORIGIN_FILL = "1";
 
-	enum DeptCategoryEnum {
+	@Getter
+    enum DeptCategoryEnum {
 		STATION(4,"站点")
 		;
-		@Getter
+		private final Integer value;
-		private Integer value;
+		private final String describe;
-		private String describe;
 
 		DeptCategoryEnum(Integer value, String describe) {
 			this.value = value;
@@ -43,18 +43,18 @@ public interface StationConstants {
 	}
 
 	/**视频监测秘钥**/
-	enum VideoMonitorEnum {
+    @Getter
+    enum VideoMonitorEnum {
 		ZT_YUN("175.6.40.71:443","21815698","QzPHyG2qWgQM8tBJOAJk"),
 		TX_YUN("","","")
 		;
-		@Getter
+		private final String videoHost;
-		private String videoHost;
 
 		@Getter
-		private String appKey;
+		private final String appKey;
 
 		@Getter
-		private String appSecret;
+		private final String appSecret;
 
 		VideoMonitorEnum(String videoHost, String appKey, String appSecret) {
 			this.videoHost = videoHost;
@@ -69,15 +69,15 @@ public interface StationConstants {
 
 	String APP_SECRET = "QzPHyG2qWgQM8tBJOAJk";
 
-	enum HikVideoStatusEnum{
+	@Getter
+    enum HikVideoStatusEnum{
 		IS_HIKVIDEO(1,"平台接入"),
 		NOT_HIKVIDEO(0,"非平台接入")
 		;
 
+		private final int status;
 		@Getter
-		private int status;
+		private final String des;
-		@Getter
-		private String des;
 
 		HikVideoStatusEnum(int status, String des) {
 			this.status = status;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/enume/StationEnumConstants.java

@@ -7,7 +7,8 @@ public interface StationEnumConstants {
 	/**
 	 * 站点类型
 	 */
-	enum StationTypeEnum {
+    @Getter
+    enum StationTypeEnum {
 		/**
 		 * 水电站
 		 */
@@ -45,12 +46,11 @@ public interface StationEnumConstants {
 		 * 泵站
 		 */
 		STATION_TYPE_8(8, "泵站");
+		private final int status;
 		@Getter
-		private int status;
+		private final String value;
-		@Getter
-		private String value;
 
-		private StationTypeEnum(int status, String value) {
+		StationTypeEnum(int status, String value) {
 			this.status = status;
 			this.value = value;
 		}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/vRView/constant/VRViewEnum.java

@@ -153,11 +153,11 @@ public enum VRViewEnum {
 //	BEARING_SDZW_WD("水导轴瓦温度", "℃");
 
 
-	private String type;
+	private final String type;
 
-	private String desc;
+	private final String desc;
 
-	private VRViewEnum(String type, String desc) {
+	VRViewEnum(String type, String desc) {
 		this.type = type;
 		this.desc = desc;
 	}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/vRView/constant/VRViewSortEnum.java

@@ -102,11 +102,11 @@ public enum VRViewSortEnum {
 
 
 
-	private String type;
+	private final String type;
 
-	private Integer value;
+	private final Integer value;
 
-	private VRViewSortEnum(String type, Integer value) {
+	VRViewSortEnum(String type, Integer value) {
 		this.type = type;
 		this.value = value;
 	}

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java

@@ -34,11 +34,11 @@ public interface TaskFeignClient {
 
     @GetMapping("/task/list")
     @ApiOperation(value = "分页显示任务列表", notes = "传入task")
-    public R<BladePage<TaskVo>> list(@SpringQueryMap TaskListQuery task, @SpringQueryMap Query query);
+    R<BladePage<TaskVo>> list(@SpringQueryMap TaskListQuery task, @SpringQueryMap Query query);
 
     @GetMapping(value = "/task/detail")
     @ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid")
-    public R<TaskEntity> detail(@RequestParam Long id);
+    R<TaskEntity> detail(@RequestParam Long id);
 
 
     /**
@@ -46,16 +46,16 @@ public interface TaskFeignClient {
      */
     @GetMapping("/task/pageList/{page}/{size}")
     @ApiOperation(value = "分页显示任务列表", notes = "传入task")
-    public R<BladePage<TaskVo>> pageList(
+    R<BladePage<TaskVo>> pageList(
             @PathVariable("page") Long page,
-             @PathVariable("size") Long size,
+            @PathVariable("size") Long size,
             @SpringQueryMap TaskListQuery task);
 
 
     @GetMapping(value = "/task/event/list")
     @ApiOperation(value = "任务查看弹窗下面的列表  巡检情况列表信息分页", notes = "传入taskId")
-    public R<BladePage<EventListVO>> eventList(@RequestParam Long taskId, @SpringQueryMap Query query,
+    R<BladePage<EventListVO>> eventList(@RequestParam Long taskId, @SpringQueryMap Query query,
-                                               @SpringQueryMap BladeUser bladeUser);
+                                        @SpringQueryMap BladeUser bladeUser);
 
 
     /**
@@ -63,7 +63,7 @@ public interface TaskFeignClient {
      */
     @GetMapping(value = "/task/getTaskById")
     @ApiOperation(value = "获取任务详情", notes = "传入taskId")
-    public R<List<TaskObjectVO>> getTaskById(@RequestParam Long id);
+    R<List<TaskObjectVO>> getTaskById(@RequestParam Long id);
 
 
     /**
@@ -71,7 +71,7 @@ public interface TaskFeignClient {
      */
     @GetMapping("task/getTaskListStatistics")
     @ApiOperation(value = "巡检计划统计", notes = "传入计划id")
-    public R<List<VoteChartVo>> getTaskListStatistics(@RequestParam String startTime,@RequestParam  String endTime,
+    R<List<VoteChartVo>> getTaskListStatistics(@RequestParam String startTime, @RequestParam String endTime,
-                                                      @RequestParam Long deptId);
+                                               @RequestParam Long deptId);
 
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/PlanContants.java

@@ -17,7 +17,8 @@ public interface PlanContants {
 	/**计划状态字典key**/
 	String PLAN_STATUS = "planStatus";
 
-	public enum PlanTypeEnum{
+	@Getter
+    enum PlanTypeEnum{
 		/**
 	     *  计划人员模式
 	     */
@@ -38,9 +39,8 @@ public interface PlanContants {
 		 *  计划班次模式
 		 */
 		CLASS_TYPE("4");
-		@Getter
+		private final String type;
-		private String type;
+		PlanTypeEnum(String type){
-		private PlanTypeEnum(String type){
 			this.type = type;
 		}
 	}
@@ -48,7 +48,8 @@ public interface PlanContants {
 	/**
 	 * 0:待审核-->1:已审核-->2:派发中-->3:暂停-->4:结束-->5审核不通过-->6待提交
 	 */
-	public enum PlanStatusEnum{
+    @Getter
+    enum PlanStatusEnum{
 		/**
 		 * 待审核
 		 */
@@ -78,14 +79,14 @@ public interface PlanContants {
 		 */
 		PLAN_SUBMIT("6");
 
-		@Getter
+		private final String status;
-		private String status;
+		PlanStatusEnum(String status){
-		private PlanStatusEnum(String status){
 			this.status = status;
 		}
 	}
 
-	public enum PlanCycleEnum {
+	@Getter
+    enum PlanCycleEnum {
 		/**
 	     * 计划周期每次
 	     */
@@ -110,9 +111,8 @@ public interface PlanContants {
 	     *  计划周期每周
 	     */
 		EVERYYEAR_CYCLE("4");
-		@Getter
+		private final String cycle;
-		private String cycle;
+		PlanCycleEnum(String cycle){
-		private PlanCycleEnum(String cycle){
 			this.cycle = cycle;
 		}
 	}
@@ -121,10 +121,10 @@ public interface PlanContants {
 	 * 派发方式：0 抢占模式  1 并发模式
 	 */
 	@Getter
-	public enum PlanMethodEnum{
+    enum PlanMethodEnum{
 		SEIZE("0"),CONCURRENT("1");
-		private String method;
+		private final String method;
-		private PlanMethodEnum(String method){
+		PlanMethodEnum(String method){
 			this.method = method;
 		}
 	}
@@ -135,8 +135,8 @@ public interface PlanContants {
 	@Getter
 	enum PlanContentTypeEnum{
 		COMMON("common"),TEMP("temporary");
-		private String desc;
+		private final String desc;
-		private PlanContentTypeEnum(String desc){
+		PlanContentTypeEnum(String desc){
 			this.desc = desc;
 		}
 	}
@@ -158,7 +158,7 @@ public interface PlanContants {
 		 * 2机器人巡检
 		 */
 		ROBOT("2");
-		private String val;
+		private final String val;
 		InspectTypeEnum(String val){
 			this.val = val;
 		}
@@ -170,7 +170,7 @@ public interface PlanContants {
 	@Getter
 	enum GenTaskImmediateEnum{
 		YES(1),NO(0);
-		private int flag;
+		private final int flag;
 		GenTaskImmediateEnum(int flag){
 			this.flag = flag;
 		}
@@ -179,10 +179,10 @@ public interface PlanContants {
 	/**
 	 * 是否自动巡检 0-否 1-是
 	 */
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum AutoVideoEnum {
 		YES("1"),NO("0");
-		@Getter
 		private String flag;
 
 

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java

@@ -25,7 +25,7 @@ public interface TaskContants {
 	/**
 	 * 流程key
 	 */
-	final String PROGROM_FLOWABLE_KEY = "inspectProgram";
+    String PROGROM_FLOWABLE_KEY = "inspectProgram";
 
 	/**
 	 * 巡检任务类型字典key
@@ -35,14 +35,15 @@ public interface TaskContants {
 	/**
 	 * 流程key
 	 */
-	final String TASK_USER = "problemUser";
+    String TASK_USER = "problemUser";
 
 	/**
 	 * 0未开始 1进行中 2暂停 3已完成 4未完成
 	 * @author ninglong
 	 *
 	 */
-	public enum TaskStatusEnum{
+    @Getter
+    enum TaskStatusEnum{
 		/**
 	     *  任务状态未开始常量值
 	     */
@@ -63,9 +64,8 @@ public interface TaskContants {
 		 *  任务状态未完成常量值
 		 */
 		UNFINISH_STATUS("4");
-		@Getter
+		private final String status;
-		private String status;
+		TaskStatusEnum(String status){
-		private TaskStatusEnum(String status){
 			this.status = status;
 		}
 	}
@@ -74,7 +74,8 @@ public interface TaskContants {
 	 * 领用状态 0:未领用  1:已领用
 	 * @author ninglong
 	 */
-	public enum ClaimStatusEnum{
+    @Getter
+    enum ClaimStatusEnum{
 		/**
 		 * 0:未领用
 		 */
@@ -83,9 +84,8 @@ public interface TaskContants {
 		 * 1:已领用
 		 */
 		COLLECT("1");
-		@Getter
+		private final String status;
-		private String status;
+		ClaimStatusEnum(String status){
-		private ClaimStatusEnum(String status){
 			this.status = status;
 		}
 	}
@@ -94,11 +94,11 @@ public interface TaskContants {
 	 * 报备模式 0 任务报备  1 人员报备
 	 * @author ninglong
 	 */
-	public enum TaskRecordTypeEnum{
+    @Getter
+    enum TaskRecordTypeEnum{
 		task("0"),people("1");
-		@Getter
+		private final String type;
-		private String type;
+		TaskRecordTypeEnum(String type){
-		private TaskRecordTypeEnum(String type){
 			this.type = type;
 		}
 	}
@@ -106,11 +106,11 @@ public interface TaskContants {
 	 * 巡检备案 0 未备案 1已备案
 	 * @author ninglong
 	 */
-	public enum keepOnRecordEnum{
+    @Getter
+    enum keepOnRecordEnum{
 		no("0"),yes("1");
-		@Getter
+		private final String type;
-		private String type;
+		keepOnRecordEnum(String type){
-		private keepOnRecordEnum(String type){
 			this.type = type;
 		}
 	}
@@ -119,11 +119,11 @@ public interface TaskContants {
 	 * 是否问题 0:否 1 是  默认0
 	 * @author ninglong
 	 */
-	public enum ProblemEnum{
+    @Getter
+    enum ProblemEnum{
 		no("0"),yes("1");
-		@Getter
+		private final String type;
-		private String type;
+		ProblemEnum(String type){
-		private ProblemEnum(String type){
 			this.type = type;
 		}
 	}
@@ -133,11 +133,11 @@ public interface TaskContants {
 	 * @author ninglong
 	 *
 	 */
-	public enum AvailableEnum{
+    @Getter
+    enum AvailableEnum{
 		no("0"),yes("1");
-		@Getter
+		private final String type;
-		private String type;
+		AvailableEnum(String type){
-		private AvailableEnum(String type){
 			this.type = type;
 		}
 	}
@@ -147,16 +147,17 @@ public interface TaskContants {
 	 * @author py
 	 *
 	 */
-	public enum CurrentStatusEnum{
+    @Getter
+    enum CurrentStatusEnum{
 		normal("1"), abnormal("0") ;
-		@Getter
+		private final String type;
-		private String type;
+		CurrentStatusEnum(String type){
-		private CurrentStatusEnum(String type){
 			this.type = type;
 		}
 	}
 
-	enum StatusEnum{
+	@Getter
+    enum StatusEnum{
 		/**
 		 *  状态未完成
 		 */
@@ -165,9 +166,8 @@ public interface TaskContants {
 		 *  任务状态已完成
 		 */
 		FINISH_STATUS(1);
-		@Getter
+		private final Integer status;
-		private Integer status;
+		StatusEnum(Integer status){
-		private StatusEnum(Integer status){
 			this.status = status;
 		}
 	}

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/threedimensional/fegin/RouteFeignClient.java

@@ -41,8 +41,8 @@ public interface RouteFeignClient {
      * @return
      */
     @GetMapping("/st_re_route/list")
-    public R<BladePage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route,
+    R<BladePage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route,
-                                          @SpringQueryMap Query query);
+                                   @SpringQueryMap Query query);
 
 
     /**
@@ -51,7 +51,7 @@ public interface RouteFeignClient {
     @PostMapping("/st_re_route/save")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入st_re_route")
-    public R save(@RequestBody RouteEntity st_re_route);
+    R save(@RequestBody RouteEntity st_re_route);
 
 
     /**
@@ -60,7 +60,7 @@ public interface RouteFeignClient {
     @PostMapping("/st_re_route/update")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "传入st_re_route")
-    public R update(@RequestBody RouteEntity st_re_route);
+    R update(@RequestBody RouteEntity st_re_route);
 
 
     /**
@@ -69,5 +69,5 @@ public interface RouteFeignClient {
     @PostMapping("/st_re_route/remove")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+    R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 }

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java

@@ -28,13 +28,13 @@ public class MessageConstants {
 
 	public final static String WS_MESSAGE_KEY = "hzims:message:websocket:push";
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	public enum LogInquireDateEnum {
 		YEAR("year"),
 		MONTH("month"),
 		DAY("day")
 		;
-		@Getter
 		private String value;
 		public static LogInquireDateEnum getClassifyDesByKey(String value) {
 			Optional<LogInquireDateEnum> anEnum = Arrays.stream(LogInquireDateEnum.class.getEnumConstants())
@@ -43,7 +43,8 @@ public class MessageConstants {
 		}
 	}
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	@NoArgsConstructor
 	public enum BusinessClassifyEnum {
 		INSPECT("inspect","巡检管理"),
@@ -68,7 +69,6 @@ public class MessageConstants {
 		OVERHAUL_TASK("overhaul-task","检修任务"),
 
 		;
-		@Getter
 		private String key;
 		@Getter
 		private String description;

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/enums/PushStatEnum.java

@@ -23,7 +23,7 @@ public enum PushStatEnum {
     private Integer code;
 
     @Getter
-    private String value;
+    private final String value;
 
     PushStatEnum(Integer code, String value) {
         this.code = code;

hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java

@@ -24,8 +24,8 @@ public interface ProcessDictFeignService {
      * @return
      */
     @GetMapping("/process-dict/getTicketByCode")
-    public String getTicketByCode(@RequestParam("staff") String staff,
+    String getTicketByCode(@RequestParam("staff") String staff,
-                                  @RequestParam("typeInstrument") String typeInstrument);
+                           @RequestParam("typeInstrument") String typeInstrument);
 
 
     /**
@@ -35,5 +35,5 @@ public interface ProcessDictFeignService {
      * @return
      */
     @GetMapping("/process-dict/selectDictValueByKey")
-    public String selectDictValueByKey(@RequestParam("dictKey") String dictKey);
+    String selectDictValueByKey(@RequestParam("dictKey") String dictKey);
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/Constants.java

@@ -22,7 +22,8 @@ public class Constants {
 	/**
 	 * 安全检查项目枚举
 	 */
-	@NoArgsConstructor
+	@Getter
+    @NoArgsConstructor
 	@AllArgsConstructor
 	public enum SafeCheckProjectEnum {
 		WORK_TICKET("1.1","工作票合格率"),
@@ -34,21 +35,20 @@ public class Constants {
 		MAINTENANCE_TASK("4.1","定期维护"),
 		ACCESS_TASK("4.2","定期检修"),
 		;
-		@Getter
 		private String type;
 		@Getter
 		private String name;
 	}
 
-	public enum SysFileStatusEnum {
+	@Getter
+    public enum SysFileStatusEnum {
 		PENDING(1,"待审批"),
 		APPROVED(2,"已审批"),
 		REJECT(3,"驳回")
 		;
+		private final Integer status;
 		@Getter
-		private Integer status;
+		private final String describe;
-		@Getter
-		private String describe;
 
 		SysFileStatusEnum(Integer status, String describe) {
 			this.status = status;

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java

@@ -45,5 +45,5 @@ public interface CheckCompanyFeignClient {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 40)
     @ApiOperation(value = "详情", notes = "传入id")
-    public R<CheckCompanyVo> detail(@RequestParam Long id);
+    R<CheckCompanyVo> detail(@RequestParam Long id);
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java

@@ -29,7 +29,7 @@ public interface SafeEquipmentTrialFeignClient {
     @GetMapping("/safeEquimentTrial/list")
     @ApiOperationSupport(order = 50)
     @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")
-    public R<BladePage<SafeEquipmentTrialVO>> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ;
+    R<BladePage<SafeEquipmentTrialVO>> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ;
 
 }
 

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java

@@ -33,8 +33,8 @@ public interface SafeproductFeignClient {
     @GetMapping("/checkMonth/listconferenceScope/{page}/{size}")
     @ApiOperationSupport(order = 50)
     @ApiOperation(value = "分页", notes = "查询条件：month,status,createDept")
-    public R<BladePage<CheckMonthVo>> listconferenceScope(@PathVariable Long page, @PathVariable Long size,
+    R<BladePage<CheckMonthVo>> listconferenceScope(@PathVariable Long page, @PathVariable Long size,
-                                                         @SpringQueryMap CheckMonthEntity req);
+                                                   @SpringQueryMap CheckMonthEntity req);
 
 
     /**
@@ -43,7 +43,7 @@ public interface SafeproductFeignClient {
     @GetMapping("/checkMonth/detail")
     @ApiOperationSupport(order = 40)
     @ApiOperation(value = "详情", notes = "传入id")
-    public R<CheckMonthVo> detail(@RequestParam Long id);
+    R<CheckMonthVo> detail(@RequestParam Long id);
 
 
 

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/DictConstants.java

@@ -18,12 +18,12 @@ public interface DictConstants {
 	/**危险等级**/
 	String RISK_LEVEL = "riskLevel";
 
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	enum DangerSourceTypeEnum {
 		OPERATION(1,"作业活动"),
 		EQUIPMENT(2,"设备"),
 		;
-		@Getter
 		private Integer type;
 		@Getter
 		private String typeName;

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarAnnualInspectionStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 车辆年检记录状态枚举类
  *
  * @author liwen
  * @date 2024-01-22
  */
+@Getter
 public enum CarAnnualInspectionStatusEnum {
 
     FINISHED("FINISHED", "已完成"),
@@ -20,11 +23,4 @@ public enum CarAnnualInspectionStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarInsuranceStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 车辆保险记录状态枚举类
  *
  * @author liwen
  * @date 2024-01-11
  */
+@Getter
 public enum CarInsuranceStatusEnum {
 
     INSURED("INSURED", "已参保"),
@@ -20,11 +23,4 @@ public enum CarInsuranceStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 车辆维保记录状态枚举类
  *
  * @author liwen
  * @date 2024-01-10
  */
+@Getter
 public enum CarMaintenanceStatusEnum {
 
     MAINTAINED("MAINTAINED", "已维保"),
@@ -20,11 +23,4 @@ public enum CarMaintenanceStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceTypeEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 车辆维保类型枚举类
  *
  * @author liwen
  * @date 2024-01-16
  */
+@Getter
 public enum CarMaintenanceTypeEnum {
 
     MAINTAIN("MAINTAIN", "保养"),
@@ -20,11 +23,4 @@ public enum CarMaintenanceTypeEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarUsedRecordEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 用车记录枚举类
  *
  * @author liwen
  * @date 2024-01-10
  */
+@Getter
 public enum CarUsedRecordEnum {
 
     USING("USING", "使用中"),
@@ -20,11 +23,4 @@ public enum CarUsedRecordEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/ConferenceMethodEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 会议方式枚举类
  *
  * @author liwen
  * @date 2023-12-27
  */
+@Getter
 public enum ConferenceMethodEnum {
 
     ONLINE("ONLINE", "线上"),
@@ -21,11 +24,4 @@ public enum ConferenceMethodEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/ConferenceStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 会议状态枚举类
  *
  * @author liwen
  * @date 2023-12-27
  */
+@Getter
 public enum ConferenceStatusEnum {
 
     WAITING("WAITING", "未开始"),
@@ -21,11 +24,4 @@ public enum ConferenceStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/DeviceStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 特种设备状态枚举类
  *
  * @author liwen
  * @date 2024-01-16
  */
+@Getter
 public enum DeviceStatusEnum {
 
     NORMAL("NORMAL", "正常"),
@@ -20,11 +23,4 @@ public enum DeviceStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/HygieneStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 卫生自查状态枚举类
  *
  * @author liwen
  * @date 2023-12-29
  */
+@Getter
 public enum HygieneStatusEnum {
 
     WAITING("WAITING", "未开始"),
@@ -21,11 +24,4 @@ public enum HygieneStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/MsgSendTypeEnum.java

@@ -1,26 +1,22 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 消息发送类型枚举
  */
+@Getter
 public enum MsgSendTypeEnum {
 	SMS(1,"短信"),
 	WECHAT(2,"微信"),
 	APP(3,"APP");
 
-	private int value;
+	private final int value;
-	private String desc;
+	private final String desc;
 
 	MsgSendTypeEnum(int value, String desc) {
 		this.value = value;
 		this.desc = desc;
 	}
 
-	public int getValue() {
-		return value;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/RehearsalMethodEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 演练方式枚举类
  *
  * @author liwen
  * @date 2023-12-14
  */
+@Getter
 public enum RehearsalMethodEnum {
 
     ONLINE("ONLINE", "线上"),
@@ -21,11 +24,4 @@ public enum RehearsalMethodEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/RehearsalStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 演练状态枚举类
  *
  * @author liwen
  * @date 2023-12-14
  */
+@Getter
 public enum RehearsalStatusEnum {
 
     WAITING("WAITING", "未开始"),
@@ -21,12 +24,4 @@ public enum RehearsalStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/TestMethodEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 考试方式枚举类
  *
  * @author liwen
  * @date 2024-01-25
  */
+@Getter
 public enum TestMethodEnum {
 
     ONLINE("ONLINE", "线上"),
@@ -21,11 +24,4 @@ public enum TestMethodEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/TrainMethodEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 培训方式枚举类
  *
  * @author liwen
  * @date 2024-01-15
  */
+@Getter
 public enum TrainMethodEnum {
 
     ONLINE("ONLINE", "线上"),
@@ -21,11 +24,4 @@ public enum TrainMethodEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/TrainStatusEnum.java

@@ -1,11 +1,14 @@
 package com.hnac.hzims.safeproduct.enums;
 
+import lombok.Getter;
+
 /**
  * 培训计划状态枚举类
  *
  * @author liwen
  * @date 2023-12-27
  */
+@Getter
 public enum TrainStatusEnum {
 
     WAITING("WAITING", "未开始"),
@@ -21,11 +24,4 @@ public enum TrainStatusEnum {
         this.desc = desc;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/hazard/enums/DangerSourceLevelEnum.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.hazard.enums;
 
+import lombok.Getter;
 import org.springblade.core.tool.utils.StringUtil;
 
 /**
@@ -8,29 +9,22 @@ import org.springblade.core.tool.utils.StringUtil;
  * @author xiashandong
  * @created 2020/9/1 15:34
  **/
+@Getter
 public enum DangerSourceLevelEnum {
 	_10(10, "稍有危险"),
 	_20(20, "一般危险"),
 	_30(30, "显著危险"),
 	_40(40, "高度危险");
 
-	private int value;
+	private final int value;
-	private String name;
+	private final String name;
 
 	DangerSourceLevelEnum(int value, String name) {
 		this.value = value;
 		this.name = name;
 	}
 
-	public int getValue() {
+    public static String getName(int value) {
-		return value;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public static String getName(int value) {
 		for (DangerSourceLevelEnum item : DangerSourceLevelEnum.values()) {
 			if (value == item.getValue()) {
 				return item.getName();

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/Constants.java

@@ -10,18 +10,19 @@ import java.util.Optional;
 
 public interface Constants {
 
+    @Getter
     @AllArgsConstructor
     enum PlanStatusEnum {
         NOT_START(0,"未开始"),
         HAVE(1,"进行中"),
         STOPPED(2,"已停止")
         ;
-        @Getter
         private final Integer status;
         @Getter
         private final String describe;
     }
 
+    @Getter
     @AllArgsConstructor
     enum TaskStatusEnum {
         NOT_START(0,"未开始"),
@@ -29,12 +30,12 @@ public interface Constants {
         FINISH(2,"已完成"),
         NON_FINISH(3,"未完成")
         ;
-        @Getter
         private Integer status;
         @Getter
         private String describe;
     }
 
+    @Getter
     @AllArgsConstructor
     enum CycleEnum {
         /**一天一次**/
@@ -48,7 +49,6 @@ public interface Constants {
         /**一年一次**/
         CYCLE_FIVE("5",1,"year")
         ;
-        @Getter
         private String cycle;
         @Getter
         private int days;

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java

@@ -62,7 +62,7 @@ public interface TicketFeignClient {
      */
     @PostMapping("/allTicket/ticketEvaluate/save")
     @ApiOperation(value = "新增")
-    public R save(@RequestBody TicketInfoEvaluateDto req);
+    R save(@RequestBody TicketInfoEvaluateDto req);
 
 
     /**

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/TicketConstants.java

@@ -44,14 +44,14 @@ public interface TicketConstants {
     /**
      * 开票任务类型
      **/
+    @Getter
     enum TaskTypeEnum {
         RCWH("1", "日常维护"),
         JXRW("2", "检修任务"),
         JXJH("3", "检修计划");
+        private final String type;
         @Getter
-        private String type;
+        private final String typeName;
-        @Getter
-        private String typeName;
 
         TaskTypeEnum(String type, String typeName) {
             this.type = type;
@@ -62,6 +62,7 @@ public interface TicketConstants {
     /**
      * 工作票流程环节
      */
+    @Getter
     enum WorkTicketFlowEnum {
         /**
          * 开票
@@ -104,12 +105,11 @@ public interface TicketConstants {
          **/
         SIGN_CONFIRM_DELAY("9", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "签发人审核"),
         ;
+        private final String status;
         @Getter
-        private String status;
+        private final String flowId;
-        @Getter
-        private String flowId;
         @Getter
-        private String segment;
+        private final String segment;
 
         WorkTicketFlowEnum(String status, String flowId, String segment) {
             this.status = status;
@@ -123,6 +123,7 @@ public interface TicketConstants {
         }
     }
 
+    @Getter
     enum WordFileNameEnum {
         OPERATE("1", "操作票"),
         WORK("2", "工作票"),
@@ -136,10 +137,9 @@ public interface TicketConstants {
         NEW_FIRST_WORK("10", "新电气第一种工作票模板"),
         NEW_FIRST_WORK1("11", "第一种工作票"),
         ;
+        private final String type;
         @Getter
-        private String type;
+        private final String fileName;
-        @Getter
-        private String fileName;
 
         WordFileNameEnum(String type, String fileName) {
             this.type = type;
@@ -153,6 +153,7 @@ public interface TicketConstants {
     }
 
     //	两票类型枚举类
+    @Getter
     enum TicketTypeNameEnum {
 
         SWITCH_OFF("3", "倒闸操作票",1),
@@ -162,12 +163,11 @@ public interface TicketConstants {
         SECOND_WORK("7", "第二种工作票",2),
         MECHANICAL_WORK("8", "水力机械工作票",2),
         ;
+        private final String type;
         @Getter
-        private String type;
+        private final String fileName;
         @Getter
-        private String fileName;
+        private final Integer ticketType;
-        @Getter
-        private Integer ticketType;
 
         TicketTypeNameEnum(String type, String fileName, Integer ticketType) {
             this.type = type;
@@ -184,14 +184,14 @@ public interface TicketConstants {
     /**
      * 工作票安全注意事项类型
      */
+    @Getter
     enum MeasureTypeEnum {
         INIT_MEASURE("1", "开票时的安全措施"),
         SIGN_MEASURE("2", "签发补充安全措施"),
         LICENSE_MEASURE("3", "许可人补充安全措施");
+        private final String type;
         @Getter
-        private String type;
+        private final String describe;
-        @Getter
-        private String describe;
 
         MeasureTypeEnum(String type, String describe) {
             this.type = type;
@@ -199,11 +199,11 @@ public interface TicketConstants {
         }
     }
 
+    @Getter
     @AllArgsConstructor
     enum TicketCodePreEnum {
         DQ_WORK("6", "S-DQ", "电气工作票", "workTicketInfoService"),
         DQ_OPERATE("3", "YX-DQ", "电气标准票", "standardTicketInfoService");
-        @Getter
         private String type;
         @Getter
         private String prefix;
@@ -215,14 +215,14 @@ public interface TicketConstants {
         private String service;
     }
 
+    @Getter
     enum DelayStatusEnum {
         PRINCIPAL_INITIATE(1, "负责人发起"),
         LICENSOR_CONFIRM(2, "许可人确认"),
         PRINCIPAL_CONFIRM(3, "负责人确认");
+        private final int status;
         @Getter
-        private int status;
+        private final String describe;
-        @Getter
-        private String describe;
 
         DelayStatusEnum(int status, String describe) {
             this.status = status;
@@ -233,13 +233,13 @@ public interface TicketConstants {
     /**
      * 安全措施/注意事项
      */
+    @Getter
     @AllArgsConstructor
     enum SafetyMeasureStatusEnum {
         NO_EXECUTE(1, "未执行"),
         EXECUTED(2, "执行中"),
         NO_FINISH(4, "执行中"),
         FINISH(3, "已执行");
-        @Getter
         private Integer status;
         @Getter
         private String describe;
@@ -258,6 +258,7 @@ public interface TicketConstants {
     /**
      * 工作票处理流程
      */
+    @Getter
     enum FirstWorkTicketFlowEnum {
         SIGN("sign", "签发"),
         LICENSE("license", "许可人确认安全事项"),
@@ -269,10 +270,9 @@ public interface TicketConstants {
         PRINCIPAL_DELAY("principalDelay", "负责人发起工作票延期"),
         LICENSOR_DELAY("licensorDelay", "许可人确认工作票延期"),
         ;
+        private final String code;
         @Getter
-        private String code;
+        private final String describe;
-        @Getter
-        private String describe;
 
         FirstWorkTicketFlowEnum(String code, String describe) {
             this.code = code;
@@ -283,16 +283,16 @@ public interface TicketConstants {
     /**
      * 标准票处理流程
      */
+    @Getter
     enum StandardTicketStatusEnum {
         GUARDIAN_CONFIRM(1, "待监护人确认"),
         PRINCIPAL_CONFIRM(2, "待值班负责人确认"),
         END(3, "结束"),
         TERMINATION(4, "终止");
 
+        private final Integer status;
         @Getter
-        private Integer status;
+        private final String describe;
-        @Getter
-        private String describe;
 
         StandardTicketStatusEnum(Integer status, String describe) {
             this.status = status;
@@ -303,6 +303,7 @@ public interface TicketConstants {
     /**
      * 工作票处理流程
      */
+    @Getter
     @AllArgsConstructor
     enum FirstWorkTicketFlowStatusEnum {
         SIGN(1, "待签发"),
@@ -325,7 +326,6 @@ public interface TicketConstants {
         OFFLINE_OPERATE(18, "线下执行任务"),
         OFFLINE_LICENSE(19, "线下许可人许可"),
         OFFLINE_END(20, "线下结束");
-        @Getter
         private Integer status;
         @Getter
         private String describe;
@@ -352,15 +352,15 @@ public interface TicketConstants {
     /**
      * 票据合格
      */
+    @Getter
     enum TicketQualifiedEnum {
         Qualified(1, "合格"),
         No_Qualified(2, "不合格");
 
-        @Getter
+        private final Integer code;
-        private Integer code;
 
         @Getter
-        private String msg;
+        private final String msg;
 
         TicketQualifiedEnum(Integer code, String msg) {
             this.code = code;

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/WorkTicketConstants.java

@@ -13,6 +13,7 @@ import java.util.Optional;
  */
 public interface WorkTicketConstants {
 
+    @Getter
     @AllArgsConstructor
     enum WorkTicketMeasureTypeEnum {
         /** 第一种安措 **/
@@ -32,7 +33,6 @@ public interface WorkTicketConstants {
         TEN("10", "matterLibraryListTen"),
 
         ;
-        @Getter
         private String type;
         @Getter
         private String convertAttributes;
@@ -43,6 +43,7 @@ public interface WorkTicketConstants {
         }
     }
 
+    @Getter
     @AllArgsConstructor
     enum FirstWorkTicketStatusEnum {
         /** 签发 **/
@@ -77,7 +78,6 @@ public interface WorkTicketConstants {
         OFFLINE_LICENSE(15, "线下许可人许可"),
         /** 线下结束 **/
         OFFLINE_END(16, "线下结束");
-        @Getter
         private Integer status;
         @Getter
         private String description;
@@ -89,6 +89,7 @@ public interface WorkTicketConstants {
         }
     }
 
+    @Getter
     @AllArgsConstructor
     enum TicketSignageEnum {
         /**第一种工作票**/
@@ -98,7 +99,6 @@ public interface WorkTicketConstants {
         /**机械工作票**/
         MACHINE("8","JX","水力机械工作票模版.docx"),
         ;
-        @Getter
         private String ticketType;
         @Getter
         private String signage;

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/OperationTicketFeignClient.java

@@ -27,7 +27,7 @@ public interface OperationTicketFeignClient {
      */
     @PostMapping("/operation-ticket/findPending")
     @ApiOperation(value = "操作票待处理")
-    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
+    Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
 
 
 

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/TicketProcessFeignClient.java

@@ -28,6 +28,6 @@ public interface TicketProcessFeignClient {
      */
     @PostMapping("/ticket-process/findPending")
     @ApiOperation(value = "工作票待处理")
-    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
+    Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
 
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/HeWeatherInitialize.java

@@ -1,5 +1,7 @@
 package com.hnac.hzims.hzimsweather;
 
+import lombok.Getter;
+
 /**
  * 用户秘钥
  *
@@ -7,9 +9,13 @@ package com.hnac.hzims.hzimsweather;
  */
 public class HeWeatherInitialize {
 
+    @Getter
     private static String privateKey;
+    @Getter
     private static String publicId;
+    @Getter
     private static String domain;
+    @Getter
     private static String geoDomain;
 
     public static void init(String publicId, String privateKey) {
@@ -27,19 +33,4 @@ public class HeWeatherInitialize {
         HeWeatherInitialize.geoDomain = "https://geoapi.heweather.net";
     }
 
-    public static String getPrivateKey() {
-        return privateKey;
-    }
-
-    public static String getPublicId() {
-        return publicId;
-    }
-
-    public static String getDomain() {
-        return domain;
-    }
-
-    public static String getGeoDomain() {
-        return geoDomain;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/ApiEnum.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.hzimsweather.common;
 
+import lombok.Getter;
+
 /**
  * @author Djc
  * 接口标识
  */
+@Getter
 public enum ApiEnum {
 
     /**
@@ -113,7 +116,4 @@ public enum ApiEnum {
         this.path = path;
     }
 
-    public String getPath() {
-        return path;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/LangEnum.java

@@ -1,9 +1,12 @@
 package com.hnac.hzims.hzimsweather.common;
 
+import lombok.Getter;
+
 /**
  * @author Djc
  * 天气标识
  */
+@Getter
 public enum LangEnum {
     ZH("zh"),
     ZH_HANT("zh-hant"),
@@ -41,7 +44,4 @@ public enum LangEnum {
         this.lang = lang;
     }
 
-    public String getLang() {
-        return lang;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/PoiTypeEnum.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.hzimsweather.common;
 
+import lombok.Getter;
+
+@Getter
 public enum PoiTypeEnum {
 
     SCENIC("scenic");
@@ -10,7 +13,4 @@ public enum PoiTypeEnum {
         this.type = type;
     }
 
-    public String getType() {
-        return type;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/StatusEnum.java

@@ -17,7 +17,7 @@ public enum StatusEnum implements ApiStatus {
     INTERNAL_ERROR("500"),
     UNKNOWN("999");
 
-    private String code;
+    private final String code;
 
     StatusEnum(String code) {
         this.code = code;

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/UnitEnum.java

@@ -1,8 +1,11 @@
 package com.hnac.hzims.hzimsweather.common;
 
+import lombok.Getter;
+
 /**
  * 单位标识
  */
+@Getter
 public enum UnitEnum {
 
     /**
@@ -20,7 +23,4 @@ public enum UnitEnum {
         this.unit = unit;
     }
 
-    public String getUnit() {
-        return unit;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/common/WarningCountryEnum.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.hzimsweather.common;
 
+import lombok.Getter;
+
+@Getter
 public enum WarningCountryEnum {
     CHINA("cn");
 
@@ -9,7 +12,4 @@ public enum WarningCountryEnum {
         this.country = country;
     }
 
-    public String getCountry() {
-        return country;
-    }
 }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/constants/WeatherConstant.java

@@ -15,7 +15,8 @@ public interface WeatherConstant {
 	/**
 	 * 天气数据保存枚举（key-方法）
 	 */
-	@AllArgsConstructor
+	@Getter
+    @AllArgsConstructor
 	@NoArgsConstructor
 	enum WeatherMethodKeyEnum {
 		WEATHER_3D("hzims:weather:station:3dWeather","getWeather3d"),
@@ -24,7 +25,6 @@ public interface WeatherConstant {
 		WEATHER_15D("hzims:weather:station:15dWeather","getWeather15d"),
 		WEATHER_NOW("hzims:weather:station:nowWeather","getWeatherNow"),
 		;
-		@Getter
 		private String key;
 		@Getter
 		private String method;

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/response/HeWeatherGeoResponse.java

@@ -3,10 +3,12 @@ package com.hnac.hzims.hzimsweather.response;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.hnac.hzims.hzimsweather.common.StatusEnum;
 import com.hnac.hzims.hzimsweather.common.jackson.StatusDeserializer;
+import lombok.Getter;
 
 /**
  * 城市信息搜索
  */
+@Getter
 public class HeWeatherGeoResponse {
 
     @JsonDeserialize(using = StatusDeserializer.class)
@@ -20,18 +22,10 @@ public class HeWeatherGeoResponse {
         this.code = statusEnum;
     }
 
-    public StatusEnum getCode() {
-        return code;
-    }
-
     public void setCode(StatusEnum code) {
         this.code = code;
     }
 
-    public Refer getRefer() {
-        return refer;
-    }
-
     public void setRefer(Refer refer) {
         this.refer = refer;
     }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/response/HeWeatherResponse.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.hnac.hzims.hzimsweather.common.StatusEnum;
 import com.hnac.hzims.hzimsweather.common.jackson.StatusDeserializer;
 import com.hnac.hzims.hzimsweather.common.jackson.ZonedDatetimeDeserializer;
+import lombok.Getter;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -17,6 +18,7 @@ import java.util.Map;
  *
  * @author djc
  */
+@Getter
 public class HeWeatherResponse implements Serializable {
 
     @JsonDeserialize(using = StatusDeserializer.class)
@@ -30,11 +32,7 @@ public class HeWeatherResponse implements Serializable {
     private String fxLink;
     private Refer refer;
 
-	public Map<String, Object> getExpand() {
+    public void setExpand(Map<String, Object> expand) {
-		return expand;
-	}
-
-	public void setExpand(Map<String, Object> expand) {
 		this.expand = expand;
 	}
 
@@ -48,34 +46,18 @@ public class HeWeatherResponse implements Serializable {
     }
 
 
-    public StatusEnum getCode() {
-        return code;
-    }
-
     public void setCode(StatusEnum code) {
         this.code = code;
     }
 
-    public ZonedDateTime getUpdateTime() {
-        return updateTime;
-    }
-
     public void setUpdateTime(ZonedDateTime updateTime) {
         this.updateTime = updateTime;
     }
 
-    public String getFxLink() {
-        return fxLink;
-    }
-
     public void setFxLink(String fxLink) {
         this.fxLink = fxLink;
     }
 
-    public Refer getRefer() {
-        return refer;
-    }
-
     public void setRefer(Refer refer) {
         this.refer = refer;
     }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/response/Refer.java

@@ -1,27 +1,22 @@
 package com.hnac.hzims.hzimsweather.response;
 
+import lombok.Getter;
+
 import java.util.List;
 
 /**
  * @author djc
  */
+@Getter
 public class Refer {
 
     private List<String> sources;
     private List<String> license;
 
-    public List<String> getSources() {
-        return sources;
-    }
-
     public void setSources(List<String> sources) {
         this.sources = sources;
     }
 
-    public List<String> getLicense() {
-        return license;
-    }
-
     public void setLicense(List<String> license) {
         this.license = license;
     }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/response/air/HeWeatherAirNowResponse.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.hzimsweather.response.air;
 
 import com.hnac.hzims.hzimsweather.common.StatusEnum;
 import com.hnac.hzims.hzimsweather.response.HeWeatherResponse;
+import lombok.Getter;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * 返回实体类
  * @author hx
  */
+@Getter
 public class HeWeatherAirNowResponse extends HeWeatherResponse {
 
     private Now now;
@@ -22,18 +24,10 @@ public class HeWeatherAirNowResponse extends HeWeatherResponse {
         super(statusEnum);
     }
 
-    public Now getNow() {
-        return now;
-    }
-
     public void setNow(Now now) {
         this.now = now;
     }
 
-    public List<Station> getStation() {
-        return station;
-    }
-
     public void setStation(List<Station> station) {
         this.station = station;
     }

hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/response/geo/City.java

@@ -1,8 +1,11 @@
 package com.hnac.hzims.hzimsweather.response.geo;
 
+import lombok.Getter;
+
 /**
  * 城市信息搜索
  */
+@Getter
 public class City {
     private String name;
     private String id;
@@ -18,106 +21,54 @@ public class City {
     private String rank;
     private String fxLink;
 
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }
 
-    public String getId() {
-        return id;
-    }
-
     public void setId(String id) {
         this.id = id;
     }
 
-    public String getLat() {
-        return lat;
-    }
-
     public void setLat(String lat) {
         this.lat = lat;
     }
 
-    public String getLon() {
-        return lon;
-    }
-
     public void setLon(String lon) {
         this.lon = lon;
     }
 
-    public String getAdm2() {
-        return adm2;
-    }
-
     public void setAdm2(String adm2) {
         this.adm2 = adm2;
     }
 
-    public String getAdm1() {
-        return adm1;
-    }
-
     public void setAdm1(String adm1) {
         this.adm1 = adm1;
     }
 
-    public String getCountry() {
-        return country;
-    }
-
     public void setCountry(String country) {
         this.country = country;
     }
 
-    public String getTz() {
-        return tz;
-    }
-
     public void setTz(String tz) {
         this.tz = tz;
     }
 
-    public String getUtcOffset() {
-        return utcOffset;
-    }
-
     public void setUtcOffset(String utcOffset) {
         this.utcOffset = utcOffset;
     }
 
-    public String getIsDst() {
-        return isDst;
-    }
-
     public void setIsDst(String isDst) {
         this.isDst = isDst;
     }
 
-    public String getType() {
-        return type;
-    }
-
     public void setType(String type) {
         this.type = type;
     }
 
-    public String getRank() {
-        return rank;
-    }
-
     public void setRank(String rank) {
         this.rank = rank;
     }
 
-    public String getFxLink() {
-        return fxLink;
-    }
-
     public void setFxLink(String fxLink) {
         this.fxLink = fxLink;
     }