流量卡导入每次覆盖

device-api-service/src/main/java/com/xy/entity/DeviceSim.java

@@ -1,5 +1,6 @@
 package com.xy.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,6 +26,7 @@ public class DeviceSim implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
     @ApiModelProperty(value = "id")
     private String id;
 

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

@@ -210,6 +210,10 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         String path = fileConfig.getPath() + File.separator + name;
         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);
+            page.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
             List<DeviceSimDto.PageVo> pageVos = baseMapper.page(page);
             List<UploadSim> uploadSims = new ArrayList<>();
             pageVos.forEach(pageVo -> {
@@ -217,6 +221,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 uploadSim.setSimId(pageVo.getSimIccid());
                 DeviceSimDto.Vo sim = pageVo.getSim();
                 if (sim != null) {
+                    uploadSim.setType(sim.getType());
                     uploadSim.setActivateTime(DataTime.toString(sim.getActivateTime()));
                     uploadSim.setTimeout(DataTime.toString(sim.getTimeout()));
                 }
@@ -280,14 +285,9 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
          */
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {
-            List<DeviceSim> deviceSims = deviceSimService.listByIds(sims.getProperty(UploadSim::getSimId));
-            JMap<String, DeviceSim> deviceSimsJMaps = new JArrayList<>(deviceSims).toMap(DeviceSim::getId).cover();
             LocalDateTime now = LocalDateTime.now();
             JList<DeviceSim> saveDeviceSims = new JArrayList<>();
             sims.forEach(uploadSim -> {
-                if (deviceSimsJMaps.containsKey(uploadSim.getSimId())) {
-                    return;
-                }
                 DeviceSim deviceSim = new DeviceSim()
                         .setId(uploadSim.getSimId().trim().replace("\"", "").replace("'", ""))
                         .setType(uploadSim.getType())
@@ -298,7 +298,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 deviceSim.setLastRenewalTime(deviceSim.getActivateTime());
                 saveDeviceSims.add(deviceSim);
             });
-            deviceSimService.saveBatch(saveDeviceSims);
+            deviceSimService.saveOrUpdateBatch(saveDeviceSims);
         }
     }