diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java index 587569c..1b746a0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java @@ -173,6 +173,13 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { vo.setPrjDataPath(item.getName()); vo.setType(item.getType()); vo.setSize(item.getSize()); + if (item.getTime() == 0) { + vo.setStartTime("/"); + } else { + LocalDateTime dateTime = Instant.ofEpochMilli((item.getTime()-8*3600)*1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); + String formattedDate = dateTime.format(formatter); + vo.setStartTime(formattedDate); + } return vo; } @@ -180,7 +187,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { MakeUpVo vo = new MakeUpVo(); vo.setPrjDataPath(fileInfo.getName()); if (fileInfo.getFileTime() != 0) { - LocalDateTime dateTime = Instant.ofEpochMilli((fileInfo.getFileTime() - 3600*8) * 1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); + LocalDateTime dateTime = Instant.ofEpochMilli((fileInfo.getFileTime() - 8*3600) * 1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); String formattedDate = dateTime.format(formatter); vo.setStartTime(formattedDate); vo.setSize(fileInfo.getFileSize()); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java index 55f985a..638255d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java @@ -157,13 +157,13 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { BeanUtils.copyProperties(item,vo); long startTime = item.getPrjTimeStart(); if (startTime != 0) { - LocalDateTime dateTime = Instant.ofEpochMilli(startTime*1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); + LocalDateTime dateTime = Instant.ofEpochMilli((startTime-8*3600)*1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); String formattedDate = dateTime.format(formatter); vo.setStartTime(formattedDate); } long endTime = item.getPrjTimeEnd(); if (endTime != -1) { - LocalDateTime dateTime = Instant.ofEpochMilli(endTime*1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); + LocalDateTime dateTime = Instant.ofEpochMilli((endTime-8*3600)*1000).atZone(ZoneId.systemDefault()).toLocalDateTime(); String formattedDate = dateTime.format(formatter); vo.setEndTime(formattedDate); }