From 94277eaebb6018e4cd0b54382c3fa5fc9d222bfb Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 10 Dec 2024 09:46:01 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E7=A7=92=E6=95=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xydl/cac/entity/IcdIed.java | 2 ++ .../com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java | 2 ++ src/main/java/com/xydl/cac/util/DateUtil.java | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xydl/cac/entity/IcdIed.java b/src/main/java/com/xydl/cac/entity/IcdIed.java index 3c23efc..405896e 100644 --- a/src/main/java/com/xydl/cac/entity/IcdIed.java +++ b/src/main/java/com/xydl/cac/entity/IcdIed.java @@ -51,4 +51,6 @@ public class IcdIed { private boolean connected; @Transient private int retry; + @Transient + private int seconds; } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index d1a5abe..fd91fe4 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -114,10 +114,12 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { if (StringUtils.isNotBlank(ied.getIp())) { ied.setConnected(false); ied.setRetry(0); + ied.setSeconds(0); IecClient iecClient = StaticVariable.realTimeClientMap.get(ied.getId()); if (iecClient != null) { ied.setRetry(iecClient.retry); ied.setConnected(iecClient.connected); + ied.setSeconds(iecClient.seconds); } result.add(ied); } diff --git a/src/main/java/com/xydl/cac/util/DateUtil.java b/src/main/java/com/xydl/cac/util/DateUtil.java index f5c5d44..9825e48 100644 --- a/src/main/java/com/xydl/cac/util/DateUtil.java +++ b/src/main/java/com/xydl/cac/util/DateUtil.java @@ -113,7 +113,6 @@ public class DateUtil { time = format(date); LocalDateTime localtime = LocalDateTime.parse(time, defaultFormatter); if (localtime.getYear() < 2000) { - log.warn("该时间小于2000年: " + str); return null; } ZonedDateTime zonedDateTime = localtime.atZone(ZoneOffset.UTC);