Merge branch 'master' into test

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

@@ -326,12 +326,11 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 DeviceSim deviceSim = new DeviceSim()
                         .setId(uploadSim.getSimId().trim().replace("\"", "").replace("'", ""))
                         .setType(uploadSim.getType())
-                        .setActivateTime(LocalDate.parse(uploadSim.getActivateTime(), df).atTime(0, 0, 0))
-                        .setTimeout(LocalDate.parse(uploadSim.getTimeout(), df).atTime(0, 0, 0))
-                        .setLastRenewalTime(LocalDate.parse(uploadSim.getLastRenewalTime(), df).atTime(0, 0, 0))
+                        .setActivateTime(Emptys.check(uploadSim.getActivateTime()) ? LocalDate.parse(uploadSim.getActivateTime(), df).atTime(0, 0, 0) : 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);
-                deviceSim.setLastRenewalTime(deviceSim.getActivateTime());
                 saveDeviceSims.add(deviceSim);
             });
             deviceSimService.saveOrUpdateBatch(saveDeviceSims);