|
@@ -28,7 +28,6 @@ import lombok.AllArgsConstructor;
|
|
|
import lombok.Data;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.SneakyThrows;
|
|
|
-import lombok.experimental.Accessors;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -168,12 +167,12 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
|
|
|
List<DeviceSimDto.PageVo> pageVos = baseMapper.page(page);
|
|
|
List<UploadSim> uploadSims = new ArrayList<>();
|
|
|
pageVos.forEach(pageVo -> {
|
|
|
- UploadSim uploadSim = new UploadSim()
|
|
|
- .setSimId(pageVo.getSimIccid());
|
|
|
+ UploadSim uploadSim = new UploadSim();
|
|
|
+ uploadSim.setSimId(pageVo.getSimIccid());
|
|
|
DeviceSimDto.Vo sim = pageVo.getSim();
|
|
|
if (sim != null) {
|
|
|
- uploadSim.setActivateTime(DataTime.toString(sim.getActivateTime()))
|
|
|
- .setTimeout(DataTime.toString(sim.getTimeout()));
|
|
|
+ uploadSim.setActivateTime(DataTime.toString(sim.getActivateTime()));
|
|
|
+ uploadSim.setTimeout(DataTime.toString(sim.getTimeout()));
|
|
|
}
|
|
|
uploadSims.add(uploadSim);
|
|
|
});
|
|
@@ -257,7 +256,6 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
|
|
|
}
|
|
|
|
|
|
@Data
|
|
|
- @Accessors(chain = true)
|
|
|
public static class UploadSim {
|
|
|
|
|
|
@ColumnWidth(25)
|
|
@@ -269,11 +267,11 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
|
|
|
private String type;
|
|
|
|
|
|
@ColumnWidth(50)
|
|
|
- @ExcelProperty(value = "激活时间 yyyy-MM-dd HH:mm:ss")
|
|
|
+ @ExcelProperty(value = "激活时间")
|
|
|
private String activateTime;
|
|
|
|
|
|
@ColumnWidth(50)
|
|
|
- @ExcelProperty(value = "过期时间 yyyy-MM-dd HH:mm:ss")
|
|
|
+ @ExcelProperty(value = "过期时间")
|
|
|
private String timeout;
|
|
|
|
|
|
}
|