流量卡导入每次覆盖

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

@@ -23,7 +23,6 @@ import com.xy.mapper.DeviceSimMapper;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -206,7 +205,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @SneakyThrows
     @ApiOperation("导出流量卡数据")
     @PostMapping("download")
-    public void download(@RequestBody DeviceSimDto.Page page) {
+    public void download(@RequestBody DeviceSimDto.Download download) {
         //生成excel
         String name = YitIdHelper.nextId() + ".xlsx";
         String path = fileConfig.getPath() + File.separator + name;
@@ -216,8 +215,8 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             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));
-            List<DeviceSimDto.PageVo> pageVos = baseMapper.page(page);
+            download.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
+            List<DeviceSimDto.PageVo> pageVos = baseMapper.page(download);
             List<UploadSim> uploadSims = new ArrayList<>();
             pageVos.forEach(pageVo -> {
                 UploadSim uploadSim = new UploadSim();
@@ -232,15 +231,16 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 uploadSims.add(uploadSim);
             });
             //修改批次号
-            if (Emptys.check(page.getBatchNo()) && Emptys.check(page.getIsUpdateBatchNo()) && page.getIsUpdateBatchNo()) {
+            if (Emptys.check(download.getBatchNo()) && Emptys.check(download.getIsUpdateBatchNo()) && download.getIsUpdateBatchNo()) {
                 LocalDateTime now = LocalDateTime.now();
                 List<DeviceSim> deviceSims = new ArrayList<>(uploadSims.size());
                 uploadSims.forEach(uploadSim -> {
                     DeviceSim deviceSim = new DeviceSim()
                             .setId(uploadSim.getSimId())
-                            .setBatchNo(page.getBatchNo())
+                            .setBatchNo(download.getBatchNo())
                             .setWaitHandle(false)
                             .setUpdateTime(now);
+                    deviceSims.add(deviceSim);
                 });
                 updateBatchById(deviceSims);
             }

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -92,9 +92,6 @@ public class DeviceSimDto {
         @ApiModelProperty(value = "批次号")
         private String batchNo;
 
-        @ApiModelProperty(value = "是否更新批次号以及待续费")
-        private Boolean isUpdateBatchNo;
-
         @ApiModelProperty(value = "待续费")
         private Boolean waitHandle;
 
@@ -147,6 +144,14 @@ public class DeviceSimDto {
         private LocalDateTime theTime;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class Download extends Page {
+
+        @ApiModelProperty(value = "是否更新批次号以及待续费")
+        private Boolean isUpdateBatchNo;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {