使用枚举模块

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -5,6 +5,10 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xy.alipay.AliPay;
 import com.xy.annotate.RestMappingController;
+import com.xy.device.EnumDeviceActiveStatus;
+import com.xy.device.EnumDeviceBusyStatus;
+import com.xy.device.EnumDeviceCharging;
+import com.xy.device.EnumDeviceFreezeStatus;
 import com.xy.dto.DeviceBluetoothAuthDto;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.dto.DeviceStatusDto;
@@ -23,7 +27,10 @@ import com.xy.service.be.MercFeignService;
 import com.xy.service.common.MercLineService;
 import com.xy.service.common.MercPlaceService;
 import com.xy.utils.*;
-import com.xy.utils.enums.*;
+import com.xy.utils.enums.DeviceActiveStateEnum;
+import com.xy.utils.enums.DeviceAuthCodeUseStatus;
+import com.xy.utils.enums.DeviceLockState;
+import com.xy.utils.enums.DeviceNetSateType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -145,7 +152,8 @@ public class MercMiniDeviceController {
             return R.fail("机器未授权给商户");
         }
         //机器是否冻结
-        if (deviceInfo.getFreezeStatus().equals(Integer.valueOf(DictsSonEnum.DEVICE_FREEZE_STATUS_2.getKey()))) {
+        Integer freezeStatus = SysDictUtils.getValue(EnumDeviceFreezeStatus.Code.CODE.getCode(), EnumDeviceFreezeStatus.N_2.getCode(), Integer.class);
+        if (deviceInfo.getFreezeStatus().equals(freezeStatus)) {
             return R.fail("机器已冻结");
         }
         return R.ok();
@@ -157,7 +165,8 @@ public class MercMiniDeviceController {
         DeviceInfo deviceInfo = deviceInfoService.getById(active.getDeviceId());
         R checkR = this.checkDeviceByMerc(deviceInfo);
         if (checkR.getCode() == R.Enum.SUCCESS.getCode()) {
-            if (!deviceInfo.getActiveState().equals(Integer.valueOf(DictsSonEnum.DEVICE_ACTIVE_STATUS_1.getKey()))) {
+            Integer activeState = SysDictUtils.getValue(EnumDeviceActiveStatus.Code.CODE.getCode(), EnumDeviceActiveStatus.N_1.getCode(), Integer.class);
+            if (!deviceInfo.getActiveState().equals(activeState)) {
                 return R.fail("机器未激活");
             }
             return R.ok();
@@ -171,7 +180,8 @@ public class MercMiniDeviceController {
         DeviceInfo deviceInfo = deviceInfoService.getById(active.getDeviceId());
         R checkR = this.checkDeviceByMerc(deviceInfo);
         if (checkR.getCode() == R.Enum.SUCCESS.getCode()) {
-            if (deviceInfo.getActiveState().equals(Integer.valueOf(DictsSonEnum.DEVICE_ACTIVE_STATUS_1.getKey()))) {
+            Integer activeState = SysDictUtils.getValue(EnumDeviceActiveStatus.Code.CODE.getCode(), EnumDeviceActiveStatus.N_1.getCode(), Integer.class);
+            if (deviceInfo.getActiveState().equals(activeState)) {
                 return R.fail("机器已激活");
             }
             return R.ok();
@@ -187,17 +197,19 @@ public class MercMiniDeviceController {
         //激活设备
         if (activeInfo.getCode() == R.Enum.SUCCESS.getCode()) {
             LocalDateTime now = LocalDateTime.now();
+            Integer activeState = SysDictUtils.getValue(EnumDeviceActiveStatus.Code.CODE.getCode(), EnumDeviceActiveStatus.N_1.getCode(), Integer.class);
+            Integer busyState = SysDictUtils.getValue(EnumDeviceBusyStatus.Code.CODE.getCode(), EnumDeviceBusyStatus.N_1.getCode(), Integer.class);
             DeviceInfo updateDeviceInfo = new DeviceInfo()
                     .setDeviceId(active.getDeviceId())
-                    .setActiveState(Integer.valueOf(DictsSonEnum.DEVICE_ACTIVE_STATUS_1.getKey()))
-                    .setBusyState(Integer.valueOf(DictsSonEnum.DEVICE_BUSY_STATUS_1.getKey()))
+                    .setActiveState(activeState)
+                    .setBusyState(busyState)
                     .setActiveTime(now)
                     .setShowStatus(true);
             deviceInfoService.updateById(updateDeviceInfo);
             //首次激活可试用x天
             DeviceCharging deviceCharging = deviceChargingService.getById(active.getDeviceId());
             if (deviceCharging == null) {
-                SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey(), DictsSonEnum.DEVICE_CHARGING_X.getKey());
+                SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode());
                 deviceChargingService.save(new DeviceCharging()
                         .setDeviceId(active.getDeviceId())
                         .setChargingX(Integer.valueOf(sysDictRedis.getValue()))

device-api-service/pom.xml

@@ -87,6 +87,10 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-enum</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 </project>

device-api-service/src/main/java/com/xy/alipay/AliPayAspet.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceType;
 import com.xy.dto.CommandMqtt;
 import com.xy.dto.DeviceChangeStatusDTO;
 import com.xy.dto.MercMiniDeviceDto;
@@ -12,7 +13,7 @@ import com.xy.service.AlipayDeviceService;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.utils.AuthorizeUtils;
 import com.xy.utils.R;
-import com.xy.utils.enums.DictsSonEnum;
+import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -84,9 +85,10 @@ public class AliPayAspet {
         List<CommandMqtt> result = new ArrayList<>();
         List<CommandMqtt> commandMqtts = (List<CommandMqtt>) args[0];
         //查询支付宝设备信息
+        Integer deviceType = SysDictUtils.getValue(EnumDeviceType.Code.CODE.getCode(), EnumDeviceType.N_5.getCode(), Integer.class);
         List<DeviceInfo> deviceInfos = deviceInfoService.list(new LambdaQueryWrapper<DeviceInfo>()
                 .in(DeviceInfo::getDeviceId, new JArrayList<>(commandMqtts).comparing(CommandMqtt::getDeviceId).getProperty(CommandMqtt::getDeviceId))
-                .eq(DeviceInfo::getDeviceType, DictsSonEnum.DEVICE_TYPE_5.getKey())
+                .eq(DeviceInfo::getDeviceType, deviceType)
         );
         if (deviceInfos.size() == 0) {
             return commandMqtts;
@@ -117,9 +119,10 @@ public class AliPayAspet {
     private boolean busyState(Object[] args) {
         MercMiniDeviceDto.BusySate busySate = (MercMiniDeviceDto.BusySate) args[0];
         //查询支付宝设备信息
+        Integer deviceType = SysDictUtils.getValue(EnumDeviceType.Code.CODE.getCode(), EnumDeviceType.N_5.getCode(), Integer.class);
         DeviceInfo deviceInfo = deviceInfoService.getOne(new LambdaQueryWrapper<DeviceInfo>()
                 .eq(DeviceInfo::getDeviceId, busySate.getDeviceId())
-                .eq(DeviceInfo::getDeviceType, DictsSonEnum.DEVICE_TYPE_5.getKey())
+                .eq(DeviceInfo::getDeviceType, deviceType)
         );
         if (deviceInfo == null) {
             return true;

device-api-service/src/main/java/com/xy/alipay/SpiDeviceServiceImpl.java

@@ -5,6 +5,7 @@ import com.xy.constants.SpiResponseConst;
 import com.xy.consumer.connected.ConnectedProducer;
 import com.xy.consumer.disconnect.DisconnectedMqttConfiguration;
 import com.xy.consumer.disconnect.DisconnectedProducer;
+import com.xy.device.EnumDeviceCharging;
 import com.xy.dto.DeviceEventMsgDto;
 import com.xy.dto.spi.DeviceAlarmNotifyDTO;
 import com.xy.dto.spi.DeviceStatusChangeNotifyDTO;
@@ -18,8 +19,6 @@ import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.DeviceStatusServiceImpl;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
-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;
@@ -97,7 +96,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
                 //首次激活可试用x天
                 DeviceCharging deviceCharging = deviceChargingService.getById(deviceInfo.getDeviceId());
                 if (deviceCharging == null) {
-                    SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey(), DictsSonEnum.DEVICE_CHARGING_X.getKey());
+                    SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode());
                     deviceChargingService.save(new DeviceCharging()
                             .setDeviceId(deviceInfo.getDeviceId())
                             .setChargingX(Integer.valueOf(sysDictRedis.getValue()))

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

@@ -4,12 +4,13 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.consumer.MqttConsumer;
+import com.xy.device.EnumDeviceOnlineStatus;
 import com.xy.dto.DeviceNetRecordDto;
 import com.xy.dto.DeviceStatusDto;
 import com.xy.service.DeviceNetRecordServiceImpl;
 import com.xy.service.DeviceStatusServiceImpl;
+import com.xy.utils.SysDictUtils;
 import com.xy.utils.ThreadPoolUtils;
-import com.xy.utils.enums.DictsSonEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,7 +34,8 @@ public class ConnectedConsumer implements MqttConsumer {
 
     @Override
     public boolean message(String topic, String payload) {
-        return exc(payload, DictsSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt());
+        Integer value = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.CONNECTED.getCode(), Integer.class);
+        return exc(payload, value);
     }
 
     public boolean exc(String payload, int netState) {
@@ -47,8 +49,6 @@ public class ConnectedConsumer implements MqttConsumer {
         }
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_NETWORK_POLL, 1)
                 .execute(() -> {
-                    String msg = netState == DictsSonEnum.DEVICE_ONLINE_STATUS_1.getKeyInt() ? "上线" : "离线";
-                    log.info("设备" + msg + "监听:{}", payload);
                     //上报状态
                     DeviceStatusDto.Up up = new DeviceStatusDto.Up().setDeviceId(deviceId);
                     up.setNetState(netState);

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

@@ -2,7 +2,8 @@ package com.xy.consumer.disconnect;
 
 import com.xy.consumer.MqttConsumer;
 import com.xy.consumer.connected.ConnectedConsumer;
-import com.xy.utils.enums.DictsSonEnum;
+import com.xy.device.EnumDeviceOnlineStatus;
+import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@ public class DisconnectedConsumer implements MqttConsumer {
 
     @Override
     public boolean message(String topic, String payload) {
-        return connectedConsumer.exc(payload, DictsSonEnum.DEVICE_ONLINE_STATUS_2.getKeyInt());
+        Integer value = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.DISCONNECT.getCode(), Integer.class);
+        return connectedConsumer.exc(payload, value);
     }
 }

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

@@ -7,6 +7,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceCharging;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.dto.MercAccountDto;
 import com.xy.entity.DeviceCharging;
@@ -19,8 +20,6 @@ import com.xy.service.DeviceChargingServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.MercAccountService;
 import com.xy.utils.*;
-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 +102,8 @@ public class DeviceChargingJob {
         );
         JMap<Long, DeviceInfo> deviceInfosJMaps = new JArrayList<>(deviceInfos).toMap(DeviceInfo::getDeviceId).cover();
         //字典
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey());
-        SysDictRedis sysDictRedisY = stringSysDictRedisMap.get(DictsSonEnum.DEVICE_CHARGING_Y.getKey());
+        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumDeviceCharging.Code.CODE.getCode());
+        SysDictRedis sysDictRedisY = stringSysDictRedisMap.get(EnumDeviceCharging.N_Y.getCode());
         Integer y = Integer.valueOf(sysDictRedisY.getValue());
         //开始计费
         deviceChargingsJMaps.forEach((deviceId, deviceCharging) -> {
@@ -129,7 +128,7 @@ public class DeviceChargingJob {
                         .createId()
                         .setDeviceId(deviceId)
                         .setChargingMoney(balance)
-                        .setChargingType(DictsSonEnum.DEVICE_CHARGING_100.getKeyInt())
+                        .setChargingType(Integer.valueOf(stringSysDictRedisMap.get(EnumDeviceCharging.N_100.getCode()).getValue()))
                         .setChargingDateTime(newTimeOut)
                         .setCreateTime(now);
                 deviceChargingHistories.add(deviceChargingHistory);

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

@@ -6,10 +6,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.entity.DeviceData;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceDataMapper;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_data_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_DATA_DAY.getCode());
         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

@@ -6,10 +6,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.entity.DeviceEventMsg;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceEventMsgMapper;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_errors_record_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_ERRORS_RECORD_DAY.getCode());
         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

@@ -6,10 +6,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.entity.DeviceNetRecord;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceNetRecordMapper;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_net_record_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_NET_RECORD_DAY.getCode());
         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

@@ -6,10 +6,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.entity.DeviceRecords;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceRecordsMapper;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_records_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_RECORDS_DAY.getCode());
         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

@@ -6,10 +6,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.entity.DeviceTempRecords;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceTempRecordsMapper;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_temp_records_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_TEMP_RECORDS_DAY.getCode());
         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

@@ -9,10 +9,10 @@ import com.xy.entity.MqttCommand;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.MqttCommandMapper;
 import com.xy.service.MqttServiceImpl;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
 import com.xy.utils.SysDictUtils;
-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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_day");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.MQTT_COMMAND_DAY.getCode());
         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(DictsEnum.DATA_CLEAR_SIZE.getKey(), "mqtt_command_cloud");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.MQTT_COMMAND_CLOUD.getCode());
         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

@@ -3,6 +3,7 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.device.EnumDeviceCharging;
 import com.xy.dto.DeviceChargingDto;
 import com.xy.dto.DeviceChargingHistoryDto;
 import com.xy.dto.DeviceInfoDto;
@@ -12,7 +13,6 @@ import com.xy.entity.SysDictRedis;
 import com.xy.job.DeviceChargingJob;
 import com.xy.mapper.DeviceChargingMapper;
 import com.xy.utils.*;
-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(DictsEnum.DEVICE_CHARGING.getKey());
+            Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumDeviceCharging.Code.CODE.getCode());
             for (DeviceChargingDto.PageVo record : records) {
                 DeviceInfoDto.Vo deviceInfo = record.getDeviceInfo();
                 //封装最新计费历史信息

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

@@ -9,6 +9,7 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
 import com.xy.config.DeviceThreadPoolConfig;
+import com.xy.device.EnumDeviceQrCode;
 import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.SysWorkUser.ListDto;
 import com.xy.dto.SysWorkUser.SysWorkVo;
@@ -17,8 +18,6 @@ import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceCreateIdsMapper;
 import com.xy.utils.*;
-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 +136,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceCreateIdsDto.ExportQrCode exportQrCode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode());
         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

@@ -10,14 +10,13 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JConcurrentHashMap;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceDataType;
 import com.xy.dto.DeviceDataDto;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.entity.DeviceData;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceDataMapper;
 import com.xy.utils.*;
-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 +169,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByDay(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, mercId, dateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
+        return getOneData(value, deviceId, mercId, dateValue);
     }
 
     /**
@@ -181,7 +181,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneDay(Long mercId, String dateValue) {
-        return getMercListData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), mercId, dateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
+        return getMercListData(value, mercId, dateValue);
     }
 
 
@@ -193,7 +194,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneMonth(Long mercId, String dateValue) {
-        return getMercListData(DictsSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), mercId, dateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.MONTH.getCode(), String.class);
+        return getMercListData(value, mercId, dateValue);
     }
 
     /**
@@ -205,7 +207,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByMonth(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), deviceId, mercId, dateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.MONTH.getCode(), String.class);
+        return getOneData(value, deviceId, mercId, dateValue);
     }
 
     /**
@@ -217,7 +220,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByYear(Long deviceId, Long mercId, String dateValue) {
-        return getOneData(DictsSonEnum.DEVICE_DATA_TYPE_YEAR.getKey(), deviceId, mercId, dateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.YEAR.getCode(), String.class);
+        return getOneData(value, deviceId, mercId, dateValue);
     }
 
     /**
@@ -266,7 +270,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getListByDay(Long deviceId, Integer startDateValue, Integer endDateValue) {
-        return getListData(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, startDateValue, endDateValue);
+        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
+        return getListData(value, deviceId, startDateValue, endDateValue);
     }
 
     /**
@@ -301,7 +306,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
     @ApiOperation("图表数据")
     @Override
     public R<List<DeviceDataDto.DayChartVo>> dayChart(@RequestBody @Valid DeviceDataDto.DayChartDto dto) {
-        List<DeviceDataDto.DayChartVo> dayChartVos = baseMapper.dayChart(dto.getMercId(), dto.getBeginInt(), dto.getEndDateInt(),dto.getType());
+        List<DeviceDataDto.DayChartVo> dayChartVos = baseMapper.dayChart(dto.getMercId(), dto.getBeginInt(), dto.getEndDateInt(), dto.getType());
         Map<Integer, DeviceDataDto.DayChartVo> voMap = dayChartVos.stream().collect(Collectors.toMap(DeviceDataDto.DayChartVo::getTime, i -> i));
         List<String> dayList = DataTime.getBetweenDates(dto.getBeginDate().toString(), dto.getEndDate().toString(), true);
         List<Integer> dayList2 = dayList.stream().map(i -> Integer.valueOf(StrUtil.replace(i, "-", ""))).collect(Collectors.toList());
@@ -343,7 +348,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
             LocalDateTime now = LocalDateTime.now();
             String yyyyMMdd = DataTime.toString(now, "yyyyMMdd");
             //获取字典
-            Map<String, SysDictRedis> map = SysDictUtils.get(DictsEnum.DEVICE_DATA_TYPE.getKey());
+            Map<String, SysDictRedis> map = SysDictUtils.get(EnumDeviceDataType.Code.CODE.getCode());
             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/DeviceEventMsgServiceImpl.java

@@ -8,9 +8,9 @@ import com.xy.dto.DeviceInfoDto;
 import com.xy.entity.DeviceEventMsg;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.SysCodeConfigureRedis;
+import com.xy.enums.SysCodeConfigureEnum;
 import com.xy.mapper.DeviceEventMsgMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.SysCodeConfigureEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

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

@@ -21,6 +21,10 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.consts.DictConsts;
+import com.xy.device.EnumDeviceDataType;
+import com.xy.device.EnumDeviceFaultLevelPayThreshold;
+import com.xy.device.EnumDeviceOnlineStatus;
+import com.xy.device.EnumQualityMercSets;
 import com.xy.dto.*;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.*;
@@ -29,9 +33,12 @@ import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.entity.DeviceInfoQueryPage;
 import com.xy.service.be.MercFeignService;
+import com.xy.sys.EnumDataClearSize;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
-import com.xy.utils.enums.*;
+import com.xy.utils.enums.DeviceActiveStateEnum;
+import com.xy.utils.enums.DeviceLockState;
+import com.xy.utils.enums.DeviceNetSateType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jodd.introspector.MapperFunction;
@@ -176,7 +183,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("设备访问历史添加")
     public R history(DeviceInfoDto.Obj obj) {
         //获取字典
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DATA_CLEAR_SIZE.getKey(), "device_history_twig");
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_HISTORY_TWIG.getCode());
         Integer value = Integer.valueOf(sysDictRedis.getValue());
         //获取redis
         String key = keyPrefix + AuthorizeUtils.getLoginId(Long.class);
@@ -208,14 +215,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return R.fail("设备不存在");
         }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD.getKey(), DictsSonEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceFaultLevelPayThreshold.Code.CODE.getCode(), EnumDeviceFaultLevelPayThreshold.NOT_PAY.getCode());
         if (deviceInfo.getFaultLevel() >= Integer.valueOf(sysDictRedis.getValue())) {
             return R.fail("设备故障");
         }
         check(deviceStatus.getNetState(), 2, "设备已离线");
         check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getDoorStateR() : deviceStatus.getDoorStateL(), 1, "设备正在使用中，请稍后");
         //质检用户不检查
-        SysDictRedis qualitySets = SysDictUtils.get(DictsEnum.QUALITY_MERC_SETS.getKey(), DictsSonEnum.QUALITY_MERC_SETS_MERC_CODE.getKey());
+        SysDictRedis qualitySets = SysDictUtils.get(EnumQualityMercSets.Code.CODE.getCode(), EnumQualityMercSets.MERC_CODE.getCode());
         if (!qualitySets.getValue().equals(deviceInfo.getMercCode())) {
             check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
             check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备已锁机");
@@ -567,8 +574,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(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);
+        Integer onlineDictValue = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.CONNECTED.getCode(), Integer.class);
+        Integer offlineDictValue = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.DISCONNECT.getCode(), Integer.class);
 
         int onlineNum = countNetstateMap.get(onlineDictValue) == null ? 0 : countNetstateMap.get(onlineDictValue).intValue();
         int offlineNum = countNetstateMap.get(offlineDictValue) == null ? 0 : countNetstateMap.get(offlineDictValue).intValue();
@@ -626,8 +633,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId).collect(Collectors.toList());
 
             //统计条件：当天
+            String day = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
             DeviceDataDto.ListDTO deviceDataListDTO = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+                    .setDeviceIds(deviceIds).setType(day).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+
             List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(deviceDataListDTO);
             Map<Long, DeviceDataDto.Vo> dataMap = new HashMap<>();
             if (CollUtil.isNotEmpty(deviceDataList)) {
@@ -751,7 +760,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(DictsEnum.DEVICE_DATA_TYPE.getKey(), DictsSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
+            String type = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), 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

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceFactoryStatus;
+import com.xy.device.EnumDeviceQrCode;
+import com.xy.device.EnumDeviceQualityStatus;
 import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceQualityValueDto;
 import com.xy.entity.DeviceInfo;
@@ -18,8 +21,6 @@ import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.DeviceQualityMapper;
 import com.xy.utils.*;
-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 +138,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(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());
+        SysDictRedis sysDictRedis1 = SysDictUtils.get(EnumDeviceQualityStatus.Code.CODE.getCode(), EnumDeviceQualityStatus.QUALIFIED.getCode());
+        SysDictRedis sysDictRedis2 = SysDictUtils.get(EnumDeviceFactoryStatus.Code.CODE.getCode(), EnumDeviceFactoryStatus.CAN_SHIPPED.getCode());
         DeviceQuality deviceQuality = getById(rest.getQualityId());
         if (sysDictRedis1.getValue().equals(deviceQuality.getQualityState()) || sysDictRedis2.getValue().equals(deviceQuality.getFactoryState())) {
             return R.fail("设备已合格或已出厂");
@@ -244,7 +245,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("getQrCode")
     @ApiOperation("获取二维码")
     public R<String> getQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode());
         String deviceId = qrcode.getDeviceId().toString();
         String base64 = QRCodeUtils.create(sysDictRedis.getValue() + deviceId, 400, 400, "back1.png", deviceId).base64();
         return R.ok(base64);
@@ -253,7 +254,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
-        SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_QR_CODE.getKey(), DictsSonEnum.DEVICE_QR_CODE_URL.getKey());
+        SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode());
         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

@@ -3,12 +3,12 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.device.EnumEnvParams;
 import com.xy.dto.MqttUserDto;
 import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.MqttUserMapper;
 import com.xy.utils.*;
-import com.xy.utils.enums.DictsEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -50,9 +50,9 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
             return R.ok();
         }
         MqttUserDto.Vo mqttUser = list.get(0);
-        Map<String, SysDictRedis> map = SysDictUtils.get(DictsEnum.ENV_PARAMS.getKey());
-        SysDictRedis mqttUrl = map.get("mqtt_url");
-        SysDictRedis serverUrl = map.get("server_url");
+        Map<String, SysDictRedis> map = SysDictUtils.get(EnumEnvParams.Code.CODE.getCode());
+        SysDictRedis mqttUrl = map.get(EnumEnvParams.MQTT_URL.getCode());
+        SysDictRedis serverUrl = map.get(EnumEnvParams.SERVER_URL.getCode());
         mqttUser.setServerTime(System.currentTimeMillis())
                 .setIpAddress(mqttUrl.getValue())
                 .setServerUrl(serverUrl.getValue());

device-api-service/src/main/java/com/xy/service/factory/SetsCmdServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xy.service.factory;
 
 import cn.hutool.json.JSONObject;
+import com.xy.device.EnumMqttCmdTempletSets;
 import com.xy.dto.DeviceTempSetDto;
 import com.xy.dto.MqttDto;
 import com.xy.dto.PaterDto;
@@ -8,8 +9,6 @@ import com.xy.entity.DeviceTempSet;
 import com.xy.service.DeviceTempSetServiceImpl;
 import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;
-import com.xy.utils.enums.SetsEnum;
-import com.xy.utils.enums.TaskEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -29,9 +28,9 @@ public class SetsCmdServiceImpl implements CmdService {
         for (MqttDto mqttDto : mqttDtos) {
             PaterDto pater = mqttDto.getPater();
             JSONObject data = pater.getData();
-            String type = data.getStr(LambdaUtils.getProperty(TaskEnum::getType));
+            String type = data.getStr("type");
             //温度设置指令
-            if (type.equals(SetsEnum.TEMPERATURE.getType())) {
+            if (type.equals(EnumMqttCmdTempletSets.TEMPERATURE.getCode())) {
                 DeviceTempSetDto.Save save = new DeviceTempSetDto.Save()
                         .setDeviceId(mqttDto.getDeviceId())
                         .setWorkMode(data.getStr("workModel"))
@@ -60,7 +59,7 @@ public class SetsCmdServiceImpl implements CmdService {
     public R resultBack(MqttDto.ResultBack resultBack) {
         DeviceTempSetDto.DeviceTempResultBack deviceTempResultBack = resultBack.getDeviceTempResultBack();
         //温度设置指令
-        if (resultBack.getCmdType().equals(SetsEnum.TEMPERATURE.getType())) {
+        if (resultBack.getCmdType().equals(EnumMqttCmdTempletSets.TEMPERATURE.getCode())) {
             DeviceTempSetDto.Vo deviceTempSetVo = deviceTempSetService.getLastOne(new DeviceTempSetDto.GetLastOneDto().setDeviceId(deviceTempResultBack.getDeviceId())).getData();
             DeviceTempSet deviceTempSet = new DeviceTempSet()
                     .setId(deviceTempSetVo.getId())

device-api-service/src/main/java/com/xy/service/factory/TaskCmdServiceImpl.java

@@ -1,12 +1,11 @@
 package com.xy.service.factory;
 
 import cn.hutool.json.JSONObject;
+import com.xy.device.EnumMqttCmdTempletTask;
 import com.xy.dto.ActivityInfoDto;
 import com.xy.dto.MqttDto;
 import com.xy.service.ActivityInfoService;
-import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;
-import com.xy.utils.enums.TaskEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -25,9 +24,9 @@ public class TaskCmdServiceImpl implements CmdService {
     public R senCommand(List<MqttDto> mqttDtos) {
         for (MqttDto mqttDto : mqttDtos) {
             JSONObject data = mqttDto.getPater().getData();
-            String type = data.getStr(LambdaUtils.getProperty(TaskEnum::getType));
+            String type = data.getStr("type");
             //终止活动
-            if (type.equals(TaskEnum.ABORT.getType())) {
+            if (type.equals(EnumMqttCmdTempletTask.ABORT.getCode())) {
                 activityInfoService.abort(new ActivityInfoDto.Abort().setDeviceId(mqttDto.getDeviceId()));
             }
         }

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

@@ -1,45 +0,0 @@
-package com.xy.utils.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 字典枚举
- */
-@Getter
-@AllArgsConstructor
-public enum DictsEnum {
-    DEVICE_DATA_TYPE("device_data_type", "设备统计数据-统计类型"),
-
-    DATA_CLEAR_SIZE("data_clear_size", "数据保留数配置"),
-
-    DEVICE_QUALITY_STATUS("device_quality_status", "设备质检-合格状态"),
-
-    DEVICE_FACTORY_STATUS("device_factory_status", "设备质检-出厂状态"),
-
-    MQTT_CMD_TEMPLET_QUALITY("mqtt_cmd_templet_quality", "mqtt指令-指令模板-质检"),
-
-    DEVICE_FAULT_LEVEL_PAY_THRESHOLD("device_fault_level_pay_threshold", "设备-故障等级-阈值"),
-
-    DEVICE_QR_CODE("device_qr_code", "设备-二维码参数"),
-
-    DEVICE_ONLINE_STATUS("device_online_status", "设备-联网状态"),
-
-    DEVICE_BUSY_STATUS("device_busy_status", "设备-运营状态"),
-
-    ENV("env", "环境标识"),
-
-    ENV_PARAMS("env_params", "环境参数"),
-
-    DEVICE_CHARGING("device_charging", "设备计费标准"),
-
-    DEVICE_TYPE("device_type", "设备-机器类型"),
-
-    QUALITY_MERC_SETS("quality_merc_sets", "质检商户配置"),
-
-    ;
-
-    private String key;
-
-    private String msg;
-}

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

@@ -1,76 +0,0 @@
-package com.xy.utils.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 字典子枚举
- */
-@Getter
-@AllArgsConstructor
-public enum DictsSonEnum {
-
-    DEVICE_QUALITY_STATUS_QUALIFIED("qualified", "设备质检-合格状态-合格"),
-
-    DEVICE_QUALITY_STATUS_UNQUALIFIED("unqualified", "设备质检-合格状态-不合格"),
-
-    DEVICE_FACTORY_STATUS_NOT_SHIPPED("not_shipped", "设备质检-出厂状态-未出厂"),
-
-    DEVICE_FACTORY_STATUS_SHIPPING("shipping", "设备质检-出厂状态-出厂预处理中"),
-
-    DEVICE_FACTORY_STATUS_CAN_SHIPPED("can_shipped", "设备质检-出厂状态-可出厂"),
-
-    DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY("not_pay", "设备-故障等级-阈值-无法交易"),
-
-    DEVICE_QR_CODE_URL("url", "设备-二维码参数-url"),
-
-    DEVICE_ONLINE_STATUS_CONNECTED("connected", "设备-联网状态-在线"),
-    DEVICE_ONLINE_STATUS_DISCONNECT("disconnect", "设备-联网状态-离线"),
-    DEVICE_BUSY_STATUS1("1", "设备-运营状态-运营中"),
-    DEVICE_BUSY_STATUS2("2", "设备-运营状态-已停运"),
-    DEVICE_DATA_TYPE_YEAR("year", "设备统计数据-按年统计"),
-    DEVICE_DATA_TYPE_MONTH("month", "设备统计数据-按月统计"),
-    DEVICE_DATA_TYPE_DAY("day", "设备统计数据-按日统计"),
-
-    DEVICE_FREEZE_STATUS_1("1", "设备-冻结状态-正常"),
-
-    DEVICE_FREEZE_STATUS_2("2", "设备-冻结状态-冻结"),
-
-    DEVICE_ACTIVE_STATUS_1("1", "设备-激活状态-已激活"),
-
-    DEVICE_ACTIVE_STATUS_2("2", "设备-激活状态-未激活"),
-
-    DEVICE_BUSY_STATUS_1("1", "设备-运营状态-运营中"),
-
-    DEVICE_BUSY_STATUS_2("2", "设备-运营状态-已停运"),
-
-    DEVICE_ONLINE_STATUS_1("1", "设备-联网状态-在线"),
-
-    DEVICE_ONLINE_STATUS_2("2", "设备-联网状态-离线"),
-
-    ENV_UAT("uat", "环境标识-测试环境"),
-
-    ENV_PROD("prod", "环境标识-生产环境"),
-
-    DEVICE_CHARGING_X("x", "设备计费标准-机器激活后可使用天数"),
-
-    DEVICE_CHARGING_Y("y", "设备计费标准-机器欠费后可使用天数"),
-
-    DEVICE_CHARGING_100("100", "设备计费标准-余额续费方式"),
-
-    DEVICE_CHARGING_101("101", "设备计费标准-其他续费方式"),
-
-    DEVICE_TYPE_5("5", "设备-机器类型-支付宝视动态觉柜"),
-
-    QUALITY_MERC_SETS_MERC_CODE("merc_code", "质检商户配置-质检商户账号code"),
-
-    ;
-
-    private String key;
-
-    private String msg;
-
-    public int getKeyInt() {
-        return Integer.valueOf(this.key);
-    }
-}

device-api-service/src/main/java/com/xy/utils/enums/SetsEnum.java

@@ -1,36 +0,0 @@
-package com.xy.utils.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 温度设置指令枚举
- */
-@Getter
-@AllArgsConstructor
-public enum SetsEnum {
-
-    TEMPERATURE("temperature", "温度设置指令"),
-
-    ;
-
-    /**
-     * 任务类型
-     */
-    private String type;
-
-    /**
-     * 说明
-     */
-    private String msg;
-
-    public static SetsEnum getTaskEnum(String type) {
-        SetsEnum[] values = SetsEnum.values();
-        for (SetsEnum qualityEnum : values) {
-            if (qualityEnum.type.equals(type)) {
-                return qualityEnum;
-            }
-        }
-        return null;
-    }
-}

device-api-service/src/main/java/com/xy/utils/enums/SysCodeConfigureEnum.java

@@ -1,17 +0,0 @@
-package com.xy.utils.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum SysCodeConfigureEnum {
-
-    /**
-     * 设备故障
-     */
-    D01("D01");
-
-    private String code;
-
-}

device-api-service/src/main/java/com/xy/utils/enums/TaskEnum.java

@@ -1,36 +0,0 @@
-package com.xy.utils.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 任务指令枚举
- */
-@Getter
-@AllArgsConstructor
-public enum TaskEnum {
-
-    ABORT("abort", "活动终止指令"),
-
-    ;
-
-    /**
-     * 任务类型
-     */
-    private String type;
-
-    /**
-     * 说明
-     */
-    private String msg;
-
-    public static TaskEnum getTaskEnum(String type) {
-        TaskEnum[] values = TaskEnum.values();
-        for (TaskEnum qualityEnum : values) {
-            if (qualityEnum.type.equals(type)) {
-                return qualityEnum;
-            }
-        }
-        return null;
-    }
-}