feat: 61850告警可配置开关

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,10 +40,11 @@ public class IecClient implements ClientEventListener {
     public IecClient() {
     }
 
-    public IecClient(RealTimeDataService _realTimeDataService, WebSocketServer _webSocketServer) {
-        realTimeDataService = _realTimeDataService;
+    public IecClient(WebSocketServer _webSocketServer, boolean netwarn) {
+        if (netwarn) {
             webSocketServer = _webSocketServer;
         }
+    }
 
     public void init(IcdIed _ied, String xml) throws Exception {
         InputStream in = IOUtils.toInputStream(xml, StandardCharsets.UTF_8);

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;

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

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