From 0807ca3441565c5c9bef0b44f80d0c34164a8bb3 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 17 Mar 2025 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B461850=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xydl/cac/iec/IEDCollectService.java | 16 ++++++++++------ src/main/java/com/xydl/cac/iec/IecClient.java | 4 ++-- .../com/xydl/cac/iec/RealTimeDataService.java | 6 +++--- src/main/java/com/xydl/cac/task/AsyncTask.java | 5 ++++- src/main/resources/application-dev.yml | 2 +- src/main/resources/application-prod.yml | 2 +- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xydl/cac/iec/IEDCollectService.java b/src/main/java/com/xydl/cac/iec/IEDCollectService.java index dcdcb53..a1e334b 100644 --- a/src/main/java/com/xydl/cac/iec/IEDCollectService.java +++ b/src/main/java/com/xydl/cac/iec/IEDCollectService.java @@ -35,6 +35,7 @@ public class IEDCollectService { BizConfig _bizConfig; WarningRepository _warningRepository; SpectrogramHandler _spectrogramHandler; + boolean _warning; String folder = "/record"; HashMap eqmidTimeMap = new HashMap<>(); @@ -43,7 +44,7 @@ public class IEDCollectService { IcdConfigTypeInstRepository instRepository, RptparamindexRepository rptparamindexRepository, IedDlRecordService dlRecordService, DataService dataService, String xml, IcdIed ied, - WebSocketServer webSocketServer, BizConfig bizConfig, + WebSocketServer webSocketServer, BizConfig bizConfig, boolean warning, WarningRepository warningRepository, SpectrogramHandler spectrogramHandler) { _configRepository = configRepository; _attRepository = attRepository; @@ -55,6 +56,7 @@ public class IEDCollectService { this.ied = ied; _webSocketServer = webSocketServer; _bizConfig = bizConfig; + _warning = warning; _warningRepository = warningRepository; _spectrogramHandler = spectrogramHandler; iecClient = new IecClient(); @@ -90,11 +92,13 @@ public class IEDCollectService { String err = "61850采集数据异常, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort() + ", " + ex.getMessage(); log.error(err, ex); - this.saveWarning(err); - String key = ied.getName() + ied.getIp() + ied.getPort(); - if (!StaticVariable.doneWarnMap.containsKey(key)) { - StaticVariable.doneWarnMap.put(key, "1"); - _webSocketServer.sendMessage(err, null); + if (_warning) { + this.saveWarning(err); + String key = ied.getName() + ied.getIp() + ied.getPort(); + if (!StaticVariable.doneWarnMap.containsKey(key)) { + StaticVariable.doneWarnMap.put(key, "1"); + _webSocketServer.sendMessage(err, null); + } } } finally { iecClient.disconnect(); diff --git a/src/main/java/com/xydl/cac/iec/IecClient.java b/src/main/java/com/xydl/cac/iec/IecClient.java index 4b04e85..2d1c5e1 100644 --- a/src/main/java/com/xydl/cac/iec/IecClient.java +++ b/src/main/java/com/xydl/cac/iec/IecClient.java @@ -40,8 +40,8 @@ public class IecClient implements ClientEventListener { public IecClient() { } - public IecClient(WebSocketServer _webSocketServer, boolean netwarn) { - if (netwarn) { + public IecClient(WebSocketServer _webSocketServer, boolean warning) { + if (warning) { webSocketServer = _webSocketServer; } } diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java index 76e3cae..6b1436d 100644 --- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java +++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java @@ -22,8 +22,8 @@ import java.util.*; @Service @Slf4j public class RealTimeDataService { - @Value("${cac.61850.netwarn:false}") - public boolean netwarn; + @Value("${cac.61850.warning:true}") + public boolean warning; @Resource IcdFileRepository fileRepository; @Resource @@ -55,7 +55,7 @@ public class RealTimeDataService { } inDoing = true; IcdFile icdFile = optionalFile.get(); - IecClient iecClient = new IecClient(webSocketServer, netwarn); + IecClient iecClient = new IecClient(webSocketServer, warning); try { iecClient.init(ied, icdFile.getXml()); iecClient.keep = true; diff --git a/src/main/java/com/xydl/cac/task/AsyncTask.java b/src/main/java/com/xydl/cac/task/AsyncTask.java index 7205d62..7b84757 100644 --- a/src/main/java/com/xydl/cac/task/AsyncTask.java +++ b/src/main/java/com/xydl/cac/task/AsyncTask.java @@ -10,6 +10,7 @@ import com.xydl.cac.service.DataService; import com.xydl.cac.service.IedDlRecordService; import com.xydl.cac.socket.WebSocketServer; import com.xydl.cac.spectrogram.SpectrogramHandler; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -18,6 +19,8 @@ import java.util.List; @Service public class AsyncTask { + @Value("${cac.61850.warning:true}") + public boolean warning; @Resource IcdConfigTypeRepository configRepository; @Resource @@ -45,7 +48,7 @@ public class AsyncTask { instRepository, rptparamindexRepository, dlRecordService, dataService, xml, ied, - webSocketServer, bizConfig, + webSocketServer, bizConfig, warning, warningRepository, spectrogramHandler); iedService.collectAndSave(rptList, dlList); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 036ef80..a97d917 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -42,7 +42,7 @@ cac: 61850: enable: false check: false - netwarn: false + warning: true i2: enable: false url: http://192.168.1.190:8080/busi-back-ws/service/XydlService diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index eaddd2e..4fbec2b 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -42,7 +42,7 @@ cac: 61850: enable: true check: false - netwarn: false + warning: true i2: enable: false url: http://192.168.1.190:8080/busi-back-ws/service/XydlService