字典枚举挪位置

device-api-service/src/main/java/com/xy/consumer/connected/ConnectedConsumer.java

@@ -9,7 +9,7 @@ import com.xy.dto.DeviceStatusDto;
 import com.xy.service.DeviceNetRecordServiceImpl;
 import com.xy.service.DeviceStatusServiceImpl;
 import com.xy.utils.ThreadPoolUtils;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,7 +33,7 @@ public class ConnectedConsumer implements MqttConsumer {
 
     @Override
     public boolean message(String topic, String payload) {
-        return exc(payload, DictSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt());
+        return exc(payload, DictsSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt());
     }
 
     public boolean exc(String payload, int netState) {
@@ -47,7 +47,7 @@ public class ConnectedConsumer implements MqttConsumer {
         }
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_NETWORK_POLL, 1)
                 .execute(() -> {
-                    String msg = netState == DictSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt() ? "上线" : "离线";
+                    String msg = netState == DictsSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt() ? "上线" : "离线";
                     log.info("设备" + msg + "监听:{}", payload);
                     //上报状态
                     DeviceStatusDto.Up up = new DeviceStatusDto.Up().setDeviceId(deviceId);

device-api-service/src/main/java/com/xy/consumer/disconnect/DisconnectedConsumer.java

@@ -2,7 +2,7 @@ package com.xy.consumer.disconnect;
 
 import com.xy.consumer.MqttConsumer;
 import com.xy.consumer.connected.ConnectedConsumer;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -24,6 +24,6 @@ public class DisconnectedConsumer implements MqttConsumer {
 
     @Override
     public boolean message(String topic, String payload) {
-        return connectedConsumer.exc(payload, DictSonEnum.DEVICE_ONLINE_STATUS_2.getKeyInt());
+        return connectedConsumer.exc(payload, DictsSonEnum.DEVICE_ONLINE_STATUS_2.getKeyInt());
     }
 }

device-api-service/src/main/java/com/xy/job/DeviceChargingJob.java

@@ -19,8 +19,8 @@ import com.xy.service.DeviceChargingServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.MercAccountService;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -103,8 +103,8 @@ public class DeviceChargingJob {
         );
         JMap<Long, DeviceInfo> deviceInfosJMaps = new JArrayList<>(deviceInfos).toMap(DeviceInfo::getDeviceId).cover();
         //字典
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(DictEnum.DEVICE_CHARGING.getKey());
-        SysDictRedis sysDictRedisY = stringSysDictRedisMap.get(DictSonEnum.DEVICE_CHARGING_Y.getKey());
+        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey());
+        SysDictRedis sysDictRedisY = stringSysDictRedisMap.get(DictsSonEnum.DEVICE_CHARGING_Y.getKey());
         Integer y = Integer.valueOf(sysDictRedisY.getValue());
         //开始计费
         deviceChargingsJMaps.forEach((deviceId, deviceCharging) -> {
@@ -129,7 +129,7 @@ public class DeviceChargingJob {
                         .createId()
                         .setDeviceId(deviceId)
                         .setChargingMoney(balance)
-                        .setChargingType(DictSonEnum.DEVICE_CHARGING_100.getKeyInt())
+                        .setChargingType(DictsSonEnum.DEVICE_CHARGING_100.getKeyInt())
                         .setChargingDateTime(newTimeOut)
                         .setCreateTime(now);
                 deviceChargingHistories.add(deviceChargingHistory);

device-api-service/src/main/java/com/xy/job/DeviceDataJob.java

@@ -9,7 +9,7 @@ import com.xy.mapper.DeviceDataMapper;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class DeviceDataJob {
     @XxlJob("delDeviceData")
     public ReturnT<String> delDeviceData() {
         //数据保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_data_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_data_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/job/DeviceEventMsgJob.java

@@ -9,7 +9,7 @@ import com.xy.mapper.DeviceEventMsgMapper;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class DeviceEventMsgJob {
     @XxlJob("delDeviceEventMsgRecord")
     public ReturnT<String> delDeviceEventMsgRecord() {
         //数据保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_errors_record_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_errors_record_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/job/DeviceNetRecordJob.java

@@ -9,7 +9,7 @@ import com.xy.mapper.DeviceNetRecordMapper;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class DeviceNetRecordJob {
     @XxlJob("delDeviceNetRecord")
     public ReturnT<String> delDeviceNetRecord() {
         //数据保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_net_record_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_net_record_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/job/DeviceRecordsJob.java

@@ -9,7 +9,7 @@ import com.xy.mapper.DeviceRecordsMapper;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class DeviceRecordsJob {
     @XxlJob("delDeviceRecords")
     public ReturnT<String> delDeviceRecords() {
         //数据保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_records_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_records_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/job/DeviceTempRecordsJob.java

@@ -9,7 +9,7 @@ import com.xy.mapper.DeviceTempRecordsMapper;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class DeviceTempRecordsJob {
     @XxlJob("delDeviceTempRecords")
     public ReturnT<String> delDeviceTempRecords() {
         //数据保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_temp_records_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_temp_records_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/job/MqttCommandJob.java

@@ -12,7 +12,7 @@ import com.xy.service.MqttServiceImpl;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import com.xy.utils.enums.MqttCommandStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +41,7 @@ public class MqttCommandJob {
     @XxlJob("commandClean")
     public ReturnT<String> commandClean() {
         //指令保留的天数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_day");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer saveDay = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())
@@ -64,7 +64,7 @@ public class MqttCommandJob {
     @XxlJob("commandDataCloud")
     public ReturnT<String> commandDataCloud() {
         //指令执行超时分钟数
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_cloud");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_cloud");
         Integer jobParam = JobUtils.getPrams().gtInt();
         Integer threshold = jobParam != null ? jobParam
                 : sysDictRedis != null ? Integer.valueOf(sysDictRedis.getValue())

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -12,7 +12,7 @@ import com.xy.entity.SysDictRedis;
 import com.xy.job.DeviceChargingJob;
 import com.xy.mapper.DeviceChargingMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -59,7 +59,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         IPage<DeviceChargingDto.PageVo> iPage = baseMapper.page(toIPage(page.getPage()), page);
         List<DeviceChargingDto.PageVo> records = iPage.getRecords();
         if (Emptys.check(records)) {
-            Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(DictEnum.DEVICE_CHARGING.getKey());
+            Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey());
             for (DeviceChargingDto.PageVo record : records) {
                 DeviceInfoDto.Vo deviceInfo = record.getDeviceInfo();
                 //封装最新计费历史信息
@@ -86,4 +86,4 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         }
         return R.ok(toPageBean(iPage));
     }
-}
+}

device-api-service/src/main/java/com/xy/service/DeviceCreateIdsServiceImpl.java

@@ -17,8 +17,8 @@ import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceCreateIdsMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -137,7 +137,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceCreateIdsDto.ExportQrCode exportQrCode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
         List<String> list = new ArrayList<>();
         Boolean isWhere = exportQrCode.getIsWhere() == null ? false : exportQrCode.getIsWhere();
         if (!isWhere) {

device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -16,8 +16,8 @@ import com.xy.entity.DeviceData;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceDataMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -170,7 +170,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByDay(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, mercId, dateValue);
+        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -181,7 +181,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneDay(Long mercId, String dateValue) {
-        return getMercListData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), mercId, dateValue);
+        return getMercListData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), mercId, dateValue);
     }
 
 
@@ -193,7 +193,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneMonth(Long mercId, String dateValue) {
-        return getMercListData(DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), mercId, dateValue);
+        return getMercListData(DictsSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), mercId, dateValue);
     }
 
     /**
@@ -205,7 +205,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByMonth(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), deviceId, mercId, dateValue);
+        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -217,7 +217,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByYear(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_YEAR.getKey(), deviceId, mercId, dateValue);
+        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_YEAR.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -266,7 +266,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getListByDay(Long deviceId, Integer startDateValue, Integer endDateValue) {
-        return getListData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, startDateValue, endDateValue);
+        return getListData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, startDateValue, endDateValue);
     }
 
     /**
@@ -343,7 +343,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
             LocalDateTime now = LocalDateTime.now();
             String yyyyMMdd = DataTime.toString(now, "yyyyMMdd");
             //获取字典
-            Map<String, SysDictRedis> map = SysDictUtils.get(DictEnum.DEVICE_DATA_TYPE.getKey());
+            Map<String, SysDictRedis> map = SysDictUtils.get(DictsEnum.DEVICE_DATA_TYPE.getKey());
             JMap<String, Integer> jMap = new JHashMap<>(map.size());
             map.forEach((type, sysDictRedis) -> {
                 Integer dateValue = Integer.valueOf(yyyyMMdd.substring(0, Integer.valueOf(sysDictRedis.getValue())));

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -159,7 +159,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("设备访问历史添加")
     public R history(DeviceInfoDto.Obj obj) {
         //获取字典
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DATA_CLEAR_SIZE.getKey(), "device_history_twig");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_history_twig");
         Integer value = Integer.valueOf(sysDictRedis.getValue());
         //获取redis
         String key = keyPrefix + AuthorizeUtils.getLoginId(Long.class);
@@ -192,7 +192,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
         check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD.getKey(), DictSonEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD.getKey(), DictsSonEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY.getKey());
         if (deviceInfo.getFaultLevel() >= Integer.valueOf(sysDictRedis.getValue())) {
             return R.fail("设备故障");
         }
@@ -523,8 +523,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //分组统计
         Map<Integer, Long> countNetstateMap = deviceStatuses.stream().collect(Collectors
                 .groupingBy(DeviceStatus::getNetState, Collectors.counting()));
-        Integer onlineDictValue = SysDictUtils.getValue(DictEnum.DEVICE_ONLINE_STATUS.getKey(), DictSonEnum.DEVICE_ONLINE_STATUS_CONNECTED.getKey(), Integer.class);
-        Integer offlineDictValue = SysDictUtils.getValue(DictEnum.DEVICE_ONLINE_STATUS.getKey(), DictSonEnum.DEVICE_ONLINE_STATUS_DISCONNECT.getKey(), Integer.class);
+        Integer onlineDictValue = SysDictUtils.getValue(DictsEnum.DEVICE_ONLINE_STATUS.getKey(), DictsSonEnum.DEVICE_ONLINE_STATUS_CONNECTED.getKey(), Integer.class);
+        Integer offlineDictValue = SysDictUtils.getValue(DictsEnum.DEVICE_ONLINE_STATUS.getKey(), DictsSonEnum.DEVICE_ONLINE_STATUS_DISCONNECT.getKey(), Integer.class);
 
         int onlineNum = countNetstateMap.get(onlineDictValue) == null ? 0 : countNetstateMap.get(onlineDictValue).intValue();
         int offlineNum = countNetstateMap.get(offlineDictValue) == null ? 0 : countNetstateMap.get(offlineDictValue).intValue();
@@ -583,7 +583,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
             //统计条件：当天
             DeviceDataDto.ListDTO deviceDataListDTO = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+                    .setDeviceIds(deviceIds).setType(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
             List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(deviceDataListDTO);
             Map<Long, DeviceDataDto.Vo> dataMap = new HashMap<>();
             if (CollUtil.isNotEmpty(deviceDataList)) {
@@ -707,7 +707,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         BeanUtil.copyProperties(pageBean, pageData);
         if (CollUtil.isNotEmpty(records)) {
             List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
-            String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
+            String type = SysDictUtils.getValue(DictsEnum.DEVICE_DATA_TYPE.getKey(), DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
             String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
             //查询当天
             DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()

device-api-service/src/main/java/com/xy/service/DeviceQualityServiceImpl.java

@@ -18,8 +18,8 @@ import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.DeviceQualityMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
-import com.xy.utils.enums.DictSonEnum;
+import com.xy.utils.enums.DictsEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import com.xy.utils.enums.QualityEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -137,8 +137,8 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("rest")
     @ApiOperation(value = "重置多项质检", hidden = true)
     public R rest(@RequestBody DeviceQualityDto.Rest rest) {
-        SysDictRedis sysDictRedis1 = SysDictUtils.get(DictEnum.DEVICE_QUALITY_STATUS.getKey(), DictSonEnum.DEVICE_QUALITY_STATUS_QUALIFIED.getKey());
-        SysDictRedis sysDictRedis2 = SysDictUtils.get(DictEnum.DEVICE_FACTORY_STATUS.getKey(), DictSonEnum.DEVICE_FACTORY_STATUS_CAN_SHIPPED.getKey());
+        SysDictRedis sysDictRedis1 = SysDictUtils.get(DictsEnum.DEVICE_QUALITY_STATUS.getKey(), DictsSonEnum.DEVICE_QUALITY_STATUS_QUALIFIED.getKey());
+        SysDictRedis sysDictRedis2 = SysDictUtils.get(DictsEnum.DEVICE_FACTORY_STATUS.getKey(), DictsSonEnum.DEVICE_FACTORY_STATUS_CAN_SHIPPED.getKey());
         DeviceQuality deviceQuality = getById(rest.getQualityId());
         if (sysDictRedis1.getValue().equals(deviceQuality.getQualityState()) || sysDictRedis2.getValue().equals(deviceQuality.getFactoryState())) {
             return R.fail("设备已合格或已出厂");
@@ -244,7 +244,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("getQrCode")
     @ApiOperation("获取二维码")
     public R<String> getQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
         String deviceId = qrcode.getDeviceId().toString();
         String base64 = QRCodeUtils.create(sysDictRedis.getValue() + deviceId, 400, 400, "back1.png", deviceId).base64();
         return R.ok(base64);
@@ -253,7 +253,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
         String deviceId = qrcode.getDeviceId().toString();
         QRCodeUtils.create(sysDictRedis.getValue() + deviceId, 400, 400, "back1.png", deviceId).download(deviceId);
     }

device-api-service/src/main/java/com/xy/service/MqttUserServiceImpl.java

@@ -8,7 +8,7 @@ import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.MqttUserMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictsEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -50,7 +50,7 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
             return R.ok();
         }
         MqttUserDto.Vo mqttUser = list.get(0);
-        Map<String, SysDictRedis> map = SysDictUtils.get(DictEnum.ENV_PARAMS.getKey());
+        Map<String, SysDictRedis> map = SysDictUtils.get(DictsEnum.ENV_PARAMS.getKey());
         SysDictRedis mqttUrl = map.get("mqtt_url");
         SysDictRedis serverUrl = map.get("server_url");
         mqttUser.setServerTime(System.currentTimeMillis())
@@ -83,4 +83,4 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
         save(saveInfo);
         return R.ok();
     }
-}
+}

device-api-service/src/main/java/com/xy/utils/enums/DictEnum.java → device-api-service/src/main/java/com/xy/utils/enums/DictsEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum DictEnum {
+public enum DictsEnum {
     DEVICE_DATA_TYPE("device_data_type", "设备统计数据-统计类型"),
 
     DATA_CLEAR_SIZE("data_clear_size", "数据保留数配置"),

device-api-service/src/main/java/com/xy/utils/enums/DictSonEnum.java → device-api-service/src/main/java/com/xy/utils/enums/DictsSonEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum DictSonEnum {
+public enum DictsSonEnum {
 
     DEVICE_QUALITY_STATUS_QUALIFIED("qualified", "设备质检-合格状态-合格"),