From f10be51ef64fd1b0f4f56bdd3e026dcd9dff68aa Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 20 Nov 2024 13:34:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4+8=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/iec/IEDCollectService.java | 4 ++++
 src/main/java/com/xydl/cac/util/DateUtil.java         | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/xydl/cac/iec/IEDCollectService.java b/src/main/java/com/xydl/cac/iec/IEDCollectService.java
index f5622e5..3e59947 100644
--- a/src/main/java/com/xydl/cac/iec/IEDCollectService.java
+++ b/src/main/java/com/xydl/cac/iec/IEDCollectService.java
@@ -119,6 +119,7 @@ public class IEDCollectService {
         log.info("采集到" + fc + " " + paramindexNew + "=" + value + ", t=" + time);
         time = time.replace("T", " ").replace("Z", "").replace("z", "");
         Date date = DateUtil.parse(time);
+        date = DateUtil.addHour(date, 8);
         time = DateUtil.format(date);
         _dataService.insertData(rpt.getTablename(), rpt.getEqmid(), time, rpt.getColname(), value);
 
@@ -216,6 +217,9 @@ public class IEDCollectService {
                 value = bda.getValueString();
                 if ("acquisitionTime".equals(colname)) {
                     value = value.replace("T", " ").replace("Z", "").replace("z", "");
+                    Date date = DateUtil.parse(value);
+                    date = DateUtil.addHour(date, 8);
+                    value = DateUtil.format(date);
                 }
                 updateLastData(eqmid, colname, value, null);
             }
diff --git a/src/main/java/com/xydl/cac/util/DateUtil.java b/src/main/java/com/xydl/cac/util/DateUtil.java
index d9f5b1d..1e7338f 100644
--- a/src/main/java/com/xydl/cac/util/DateUtil.java
+++ b/src/main/java/com/xydl/cac/util/DateUtil.java
@@ -89,6 +89,13 @@ public class DateUtil {
         return cal.getTime();
     }
 
+    public static Date addHour(Date date, int n) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.HOUR, n);
+        return cal.getTime();
+    }
+
     public static long getDifferenceInDays(Date startDate, Date endDate) {
         LocalDate startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         LocalDate endLocalDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();