流量卡增加是否测试卡字段

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

@@ -54,5 +54,8 @@ public class DeviceSim implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateTime;
 
+    @ApiModelProperty(value = "是否测试")
+    private Boolean isTest;
+
 
 }

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

@@ -249,6 +249,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     uploadSim.setTimeout(Emptys.check(sim.getTimeout()) ? DataTime.toString(sim.getTimeout(), "yyyy-MM-dd") : null);
                     uploadSim.setLastRenewalTime(Emptys.check(sim.getLastRenewalTime()) ? DataTime.toString(sim.getLastRenewalTime(), "yyyy-MM-dd") : null);
                     uploadSim.setBatchNo(sim.getBatchNo());
+                    uploadSim.setIsTest(Emptys.check(sim.getIsTest()) && sim.getIsTest() ? "是" : "否");
                 }
                 uploadSims.add(uploadSim);
             });
@@ -312,7 +313,8 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     .setTimeout(update.getTimeout())
                     .setLastRenewalTime(update.getLastRenewalTime())
                     .setBatchNo(update.getBatchNo())
-                    .setUpdateTime(now);
+                    .setUpdateTime(now)
+                    .setIsTest(update.getIsTest());
             deviceSims.add(deviceSim);
         });
         updateBatchById(deviceSims);
@@ -355,7 +357,8 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                         .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);
+                        .setUpdateTime(now)
+                        .setIsTest(Emptys.check(uploadSim.getIsTest()) && uploadSim.getIsTest().equals("是") ? true : false);
                 saveDeviceSims.add(deviceSim);
             });
             deviceSimService.saveOrUpdateBatch(saveDeviceSims);
@@ -389,5 +392,9 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         @ExcelProperty(value = "最后续费时间")
         private String lastRenewalTime;
 
+        @ColumnWidth(25)
+        @ExcelProperty(value = "是否测试卡")
+        private String isTest;
+
     }
 }

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

@@ -208,6 +208,9 @@ public class DeviceSimDto {
         @ApiModelProperty(value = "批次号")
         private String batchNo;
 
+        @ApiModelProperty(value = "是否测试")
+        private Boolean isTest;
+
         public LocalDateTime getActivateTime() {
             return activateTime == null ? null : activateTime.atTime(0,0,0);
         }
@@ -259,6 +262,9 @@ public class DeviceSimDto {
 
         @ApiModelProperty(value = "过期状态说明")
         private String timeoutStatus;
+
+        @ApiModelProperty(value = "是否测试")
+        private Boolean isTest;
     }
 
     @Data