From 4e0b4b6b90a14cae46335236c72e5e27ff6d61e5 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 23 Oct 2024 18:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csdevice/service/impl/DeviceFtpServiceImpl.java | 9 ++++++++-
 .../service/impl/OfflineDataUploadServiceImpl.java       | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

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);
                     }