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