流量卡计费

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

@@ -13,6 +13,7 @@ import com.xy.dto.DeviceChargingDto;
 import com.xy.dto.DeviceSimDto;
 import com.xy.entity.DeviceSim;
 import com.xy.entity.DeviceSimCharge;
+import com.xy.entity.SysDictRedis;
 import com.xy.mapper.DeviceSimMapper;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.xy.utils.PlusBeans.toIPage;
 import static com.xy.utils.PlusBeans.toPageBean;
@@ -98,14 +100,17 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<DeviceSimDto.PageVo>> page(@RequestBody DeviceSimDto.Page page) {
-        Integer value = SysDictUtils.getValue(EnumSimConfig.Code.CODE.getCode(), EnumSimConfig.N_200.getCode(), Integer.class);
+        Map<String, SysDictRedis> simConfig = SysDictUtils.get(EnumSimConfig.Code.CODE.getCode());
+        Integer value = Integer.valueOf(simConfig.get(EnumSimConfig.N_200.getCode()).getValue());
         String theTime = DataTime.getStringAround(0, 0, value, 0, 0, 0);
         page.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
         IPage<DeviceSimDto.PageVo> iPage = baseMapper.page(toIPage(page.getPage()), page);
         List<DeviceSimDto.PageVo> records = iPage.getRecords();
         if (Emptys.check(records)) {
-            //封装过期状态说明
+            String name = simConfig.get(EnumSimConfig.name.getCode()).getValue();
+            Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
             records.forEach(record -> {
+                //封装过期状态说明
                 String timeoutStatus;
                 DeviceSimDto.Vo sim = record.getSim();
                 LocalDateTime timeout = sim.getTimeout();
@@ -116,6 +121,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     timeoutStatus = s <= value * 86400 ? "即将到期(" + s / 86400 + "天)" : "正常(" + s / 86400 + "天)";
                 }
                 record.getSim().setTimeoutStatus(timeoutStatus);
+                record.setChargingName(name).setChargingMoney(money);
             });
         }
         return R.ok(toPageBean(iPage));