优化费用提醒

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

@@ -8,10 +8,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
+import com.xy.device.EnumDeviceCharging;
 import com.xy.dto.MercMsgInfoDto;
 import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceInfo;
-import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceChargingMapper;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.MercMsgInfoService;
@@ -23,7 +23,6 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备管理费job
@@ -47,8 +46,7 @@ public class DeviceChargingJob {
     @XxlJob("deviceChargingHalt")
     public ReturnT<String> deviceChargingHalt() {
         LocalDateTime now = LocalDateTime.now();
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
-        int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).getValue());
+        int day = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.ARREARAGE_DAY.getCode(), Integer.class);
         String timeout = DataTime.getStringAround(0, 0, (~(day - 1)), 0, 0, 0);
         LambdaQueryWrapper<DeviceCharging> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceCharging>()
                 .select(DeviceCharging::getDeviceId)
@@ -88,8 +86,7 @@ public class DeviceChargingJob {
     @XxlJob("deviceChargingTimeout")
     public ReturnT<String> deviceChargingTimeout() {
         String now = DataTime.getSring();
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
-        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).getValue();
+        String tel = SysDictUtils.getValue(EnumMercCostMsgConfig.Code.CODE.getCode(), EnumMercCostMsgConfig.CUSTOM_TEL.getCode(), String.class);
         String mmiTime = DataTime.getStringAround(0, -1, 0, 0, 0, 0, now);
         //数据逻辑
         FunctionUtils.ParamsResult<Tuple.Tuple4<Integer, JMap<String, Object>, JMap<String, Object>, Integer>, Boolean> datas = tuple -> {
@@ -118,7 +115,7 @@ public class DeviceChargingJob {
         };
         //即将过期
         FunctionUtils.NoParamsNoResult timeout1 = () -> {
-            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_COST_DAY.getCode()).getValue());
+            int day = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_200.getCode(), Integer.class);
             String end = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)
@@ -131,7 +128,7 @@ public class DeviceChargingJob {
         };
         //欠费
         FunctionUtils.NoParamsNoResult timeout2 = () -> {
-            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).getValue());
+            int day = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.ARREARAGE_DAY.getCode(), Integer.class);
             String time1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)

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

@@ -6,9 +6,8 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
-import com.xy.device.EnumDeviceCharging;
+import com.xy.device.EnumSimConfig;
 import com.xy.dto.MercMsgInfoDto;
-import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceSimMapper;
 import com.xy.service.MercMsgInfoService;
 import com.xy.sys.EnumMercCostMsgConfig;
@@ -18,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备流量卡job
@@ -40,8 +38,7 @@ public class DeviceSimJob {
     @XxlJob("deviceSimTimeout")
     public ReturnT<String> deviceSimTimeout() {
         String now = DataTime.getSring();
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
-        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).getValue();
+        String tel = SysDictUtils.getValue(EnumMercCostMsgConfig.Code.CODE.getCode(), EnumMercCostMsgConfig.CUSTOM_TEL.getCode(), String.class);
         String mmiTime = DataTime.getStringAround(0, -1, 0, 0, 0, 0, now);
         //数据逻辑
         FunctionUtils.ParamsResult<Tuple.Tuple4<Integer, JMap<String, Object>, JMap<String, Object>, Integer>, Boolean> datas = tuple -> {
@@ -70,7 +67,7 @@ public class DeviceSimJob {
         };
         //即将过期
         FunctionUtils.NoParamsNoResult timeout1 = () -> {
-            int day = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_200.getCode(), Integer.class);
+            int day = SysDictUtils.getValue(EnumSimConfig.Code.CODE.getCode(), EnumSimConfig.N_200.getCode(), Integer.class);
             String end = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)
@@ -83,14 +80,12 @@ public class DeviceSimJob {
         };
         //欠费
         FunctionUtils.NoParamsNoResult timeout2 = () -> {
-            int day = Integer.parseInt(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).getValue());
-            String time1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)
                     .set("workType", 2)
                     .set("end", now);
             JMap<String, Object> sendParams = new JHashMap<String, Object>()
-                    .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，如您在%s前未完成续费，您的设备将停止交易，客服电话%s", now, "设备流量卡", time1, tel));
+                    .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，您的设备将停止交易，客服电话%s", now, "设备流量卡", tel));
             RecursionUtils.recursion(current -> datas.run(new Tuple.Tuple4<>(current, map, sendParams, 2)));
         };
         timeout1.run();

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

@@ -14,7 +14,6 @@ import com.xy.device.*;
 import com.xy.dto.*;
 import com.xy.entity.*;
 import com.xy.mapper.DeviceChargingMapper;
-import com.xy.sys.EnumMercCostMsgConfig;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -397,9 +396,8 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
     @Override
     @ApiOperation("查询过期条数")
     public R<DeviceChargingDto.DeviceChargingTimeoutCountVo> deviceChargingTimeoutCount(DeviceChargingDto.DeviceChargingTimeoutCount deviceChargingTimeoutCount) {
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
         String now = DataTime.getSring();
-        int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_COST_DAY.getCode()).getValue());
+        int day = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_200.getCode(), Integer.class);
         String end1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
         deviceChargingTimeoutCount.setBegin1(now)
                 .setEnd1(end1)

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

@@ -20,7 +20,6 @@ import com.xy.entity.DeviceSim;
 import com.xy.entity.DeviceSimCharge;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceSimMapper;
-import com.xy.sys.EnumMercCostMsgConfig;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
@@ -130,9 +129,8 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @Override
     @ApiOperation("查询过期条数")
     public R<DeviceSimDto.DeviceSimTimeoutCountVo> deviceSimTimeoutCount(DeviceSimDto.DeviceSimTimeoutCount deviceSimTimeoutCount) {
-        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
         String now = DataTime.getSring();
-        int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_SIM_COST_DAY.getCode()).getValue());
+        int day = SysDictUtils.getValue(EnumSimConfig.Code.CODE.getCode(), EnumSimConfig.N_200.getCode(), Integer.class);
         String end1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
         deviceSimTimeoutCount.setBegin1(now)
                 .setEnd1(end1)