#MOD 枚举

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

@@ -12,7 +12,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.DictSonEnum;
+import com.xy.utils.enums.DictsSonEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -86,7 +86,7 @@ public class AliPayAspet {
         //查询支付宝设备信息
         List<DeviceInfo> deviceInfos = deviceInfoService.list(new LambdaQueryWrapper<DeviceInfo>()
                 .in(DeviceInfo::getDeviceId, new JArrayList<>(commandMqtts).comparing(CommandMqtt::getDeviceId).getProperty(CommandMqtt::getDeviceId))
-                .eq(DeviceInfo::getDeviceType, DictSonEnum.DEVICE_TYPE_5.getKey())
+                .eq(DeviceInfo::getDeviceType, DictsSonEnum.DEVICE_TYPE_5.getKey())
         );
         if (deviceInfos.size() == 0) {
             return commandMqtts;
@@ -119,7 +119,7 @@ public class AliPayAspet {
         //查询支付宝设备信息
         DeviceInfo deviceInfo = deviceInfoService.getOne(new LambdaQueryWrapper<DeviceInfo>()
                 .eq(DeviceInfo::getDeviceId, busySate.getDeviceId())
-                .eq(DeviceInfo::getDeviceType, DictSonEnum.DEVICE_TYPE_5.getKey())
+                .eq(DeviceInfo::getDeviceType, DictsSonEnum.DEVICE_TYPE_5.getKey())
         );
         if (deviceInfo == null) {
             return true;

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

@@ -15,8 +15,8 @@ import com.xy.service.DeviceEventMsgServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
-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.work.SpiDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -96,7 +96,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
                 //首次激活可试用x天
                 DeviceCharging deviceCharging = deviceChargingService.getById(deviceInfo.getDeviceId());
                 if (deviceCharging == null) {
-                    SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_CHARGING.getKey(), DictSonEnum.DEVICE_CHARGING_X.getKey());
+                    SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_CHARGING.getKey(), DictsSonEnum.DEVICE_CHARGING_X.getKey());
                     deviceChargingService.save(new DeviceCharging()
                             .setDeviceId(deviceInfo.getDeviceId())
                             .setChargingX(Integer.valueOf(sysDictRedis.getValue()))