From ab85f75b45b512ece77f950db02a28661f9712b5 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 17 Mar 2025 09:41:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=2061850=E5=91=8A=E8=AD=A6=E5=8F=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/iec/IecClient.java          | 10 +++++-----
 .../java/com/xydl/cac/iec/RealTimeDataService.java     |  5 ++++-
 src/main/resources/application-dev.yml                 |  1 +
 src/main/resources/application-prod.yml                |  1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xydl/cac/iec/IecClient.java b/src/main/java/com/xydl/cac/iec/IecClient.java
index c671ea3..4b04e85 100644
--- a/src/main/java/com/xydl/cac/iec/IecClient.java
+++ b/src/main/java/com/xydl/cac/iec/IecClient.java
@@ -31,8 +31,7 @@ public class IecClient implements ClientEventListener {
 
     public boolean keep = false;
     public boolean connected = false;
-    private RealTimeDataService realTimeDataService;
-    private WebSocketServer webSocketServer;
+    private WebSocketServer webSocketServer = null;
     public int retry = 0;
     public int seconds = 0;
     private boolean inRetry = false;
@@ -41,9 +40,10 @@ public class IecClient implements ClientEventListener {
     public IecClient() {
     }
 
-    public IecClient(RealTimeDataService _realTimeDataService, WebSocketServer _webSocketServer) {
-        realTimeDataService = _realTimeDataService;
-        webSocketServer = _webSocketServer;
+    public IecClient(WebSocketServer _webSocketServer, boolean netwarn) {
+        if (netwarn) {
+            webSocketServer = _webSocketServer;
+        }
     }
 
     public void init(IcdIed _ied, String xml) throws Exception {
diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
index b34eb52..76e3cae 100644
--- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
+++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
@@ -10,6 +10,7 @@ import com.xydl.cac.repository.IcdFileRepository;
 import com.xydl.cac.repository.IcdIedRepository;
 import com.xydl.cac.socket.WebSocketServer;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -21,6 +22,8 @@ import java.util.*;
 @Service
 @Slf4j
 public class RealTimeDataService {
+    @Value("${cac.61850.netwarn:false}")
+    public boolean netwarn;
     @Resource
     IcdFileRepository fileRepository;
     @Resource
@@ -52,7 +55,7 @@ public class RealTimeDataService {
         }
         inDoing = true;
         IcdFile icdFile = optionalFile.get();
-        IecClient iecClient = new IecClient(this, webSocketServer);
+        IecClient iecClient = new IecClient(webSocketServer, netwarn);
         try {
             iecClient.init(ied, icdFile.getXml());
             iecClient.keep = true;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 86d3944..036ef80 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -42,6 +42,7 @@ cac:
   61850:
     enable: false
     check: false
+    netwarn: false
   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 c00131e..eaddd2e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -42,6 +42,7 @@ cac:
   61850:
     enable: true
     check: false
+    netwarn: false
   i2:
     enable: false
     url: http://192.168.1.190:8080/busi-back-ws/service/XydlService