流量卡完善

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

@@ -1,6 +1,5 @@
 package com.xy.service;
 
-import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -272,11 +271,17 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         ExcelUtils.SheetAndData<UploadSim> sheetAndData = ExcelUtils.create(path, UploadSim.class);
         sheetAndData.sheet("流量卡数据", () -> {
             //生成导出数据
-            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);
-            download.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
-            List<DeviceSimDto.PageVo> pageVos = download.getIsNotInit() ? baseMapper.page2(download) : baseMapper.page(download);
+            List<DeviceSimDto.PageVo> pageVos;
+            if (download.getIsNotInit()) {
+                pageVos = baseMapper.page2(download);
+            } else {
+                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);
+                download.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
+                pageVos = baseMapper.page(download);
+                ;
+            }
             List<UploadSim> uploadSims = new ArrayList<>();
             pageVos.forEach(pageVo -> {
                 UploadSim uploadSim = new UploadSim();