Merge branch 'master' into test

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

@@ -351,17 +351,11 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         new File(path).delete();
     }
 
+    @SneakyThrows
     @ApiOperation("导入流量卡号数据")
     @PostMapping("uploadSim")
     public R uploadSim(@RequestParam("file") MultipartFile file) {
-        ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
-                .execute(() -> {
-                    try {
-                        EasyExcel.read(file.getInputStream(), UploadSim.class, new UploadSimListener(this)).sheet().doRead();
-                    } catch (IOException e) {
-                        log.error("", e);
-                    }
-                });
+        EasyExcel.read(file.getInputStream(), UploadSim.class, new UploadSimListener(this)).sheet().doRead();
         return R.ok();
     }
 
@@ -416,18 +410,27 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             JList<DeviceSim> saveDeviceSims = new JArrayList<>();
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             sims.forEach(uploadSim -> {
-                DeviceSim deviceSim = new DeviceSim()
-                        .setId(uploadSim.getSimId().trim().replace("\"", "").replace("'", ""))
-                        .setType(uploadSim.getType())
-                        .setActivateTime(Emptys.check(uploadSim.getActivateTime()) ? DataTime.toLocal(uploadSim.getActivateTime()) : null)
-                        .setTimeout(Emptys.check(uploadSim.getTimeout()) ? LocalDate.parse(uploadSim.getTimeout(), df).atTime(0, 0, 0) : null)
-                        .setLastRenewalTime(Emptys.check(uploadSim.getLastRenewalTime()) ? LocalDate.parse(uploadSim.getLastRenewalTime(), df).atTime(0, 0, 0) : null)
-                        .setCreateTime(now)
-                        .setUpdateTime(now)
-                        .setIsTest(Emptys.check(uploadSim.getIsTest()) && uploadSim.getIsTest().equals("是") ? true : false);
-                saveDeviceSims.add(deviceSim);
+                try {
+                    String activateTime = uploadSim.getActivateTime();
+                    String timeout = uploadSim.getTimeout();
+                    String lastRenewalTime = uploadSim.getLastRenewalTime();
+                    DeviceSim deviceSim = new DeviceSim()
+                            .setId(uploadSim.getSimId().trim().replace("\"", "").replace("'", ""))
+                            .setType(uploadSim.getType())
+                            .setActivateTime(Emptys.check(activateTime) ? LocalDate.parse(activateTime.trim(), df).atTime(0, 0, 0) : null)
+                            .setTimeout(Emptys.check(timeout) ? LocalDate.parse(timeout.trim(), df).atTime(0, 0, 0) : null)
+                            .setLastRenewalTime(Emptys.check(lastRenewalTime) ? LocalDate.parse(lastRenewalTime.trim(), df).atTime(0, 0, 0) : null)
+                            .setCreateTime(now)
+                            .setUpdateTime(now)
+                            .setIsTest(Emptys.check(uploadSim.getIsTest()) && uploadSim.getIsTest().equals("是"));
+                    saveDeviceSims.add(deviceSim);
+                } catch (Exception e) {
+                    log.error("", e);
+                }
             });
-            deviceSimService.saveOrUpdateBatch(saveDeviceSims);
+            if (Emptys.check(saveDeviceSims)) {
+                deviceSimService.saveOrUpdateBatch(saveDeviceSims);
+            }
         }
     }