From 253fac5d19fb394a2b67fbb06f594390bc144931 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 14 Oct 2024 10:07:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A061850=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=BC=80=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/adapter/BusiAdapter.java   | 2 +-
 src/main/java/com/xydl/cac/task/Client61850Task.java  | 6 ++++++
 src/main/java/com/xydl/cac/util/DingTalkPushUtil.java | 2 +-
 src/main/resources/application-dev.yml                | 2 ++
 src/main/resources/application-prod.yml               | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xydl/cac/adapter/BusiAdapter.java b/src/main/java/com/xydl/cac/adapter/BusiAdapter.java
index e3b32d5..97beb83 100644
--- a/src/main/java/com/xydl/cac/adapter/BusiAdapter.java
+++ b/src/main/java/com/xydl/cac/adapter/BusiAdapter.java
@@ -21,7 +21,7 @@ import java.util.Map;
 @Slf4j
 public class BusiAdapter {
 
-    @Value("${cac.i2.enable}")
+    @Value("${cac.i2.enable:false}")
     public boolean enable;
     @Value("${cac.i2.url}")
     public String url;
diff --git a/src/main/java/com/xydl/cac/task/Client61850Task.java b/src/main/java/com/xydl/cac/task/Client61850Task.java
index 4bde094..9e5f71d 100644
--- a/src/main/java/com/xydl/cac/task/Client61850Task.java
+++ b/src/main/java/com/xydl/cac/task/Client61850Task.java
@@ -4,6 +4,7 @@ import com.xydl.cac.entity.*;
 import com.xydl.cac.repository.*;
 import com.xydl.cac.service.ModevTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -17,6 +18,8 @@ import java.util.List;
 @Slf4j
 public class Client61850Task {
 
+    @Value("${cac.iec.enable:true}")
+    public boolean enable;
     @Resource
     AsyncTask asyncTask;
     @Resource
@@ -32,6 +35,9 @@ public class Client61850Task {
 
     @Scheduled(cron = "0 * * * * ?")
     public void collectAll() {
+        if (!enable) {
+            return;
+        }
         Calendar cal = Calendar.getInstance();
         int h = cal.get(Calendar.HOUR_OF_DAY);
         int m = cal.get(Calendar.MINUTE);
diff --git a/src/main/java/com/xydl/cac/util/DingTalkPushUtil.java b/src/main/java/com/xydl/cac/util/DingTalkPushUtil.java
index 17de69f..a466604 100644
--- a/src/main/java/com/xydl/cac/util/DingTalkPushUtil.java
+++ b/src/main/java/com/xydl/cac/util/DingTalkPushUtil.java
@@ -20,7 +20,7 @@ import java.net.URLEncoder;
 @Slf4j
 public class DingTalkPushUtil {
 
-    @Value("${cac.dingding.send}")
+    @Value("${cac.dingding.send:false}")
     private boolean send;
     @Value("${cac.dingding.token}")
     private String token;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2f4369f..97478c5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -31,6 +31,8 @@ spring:
 
 cac:
   datapath: /home/xydl/ncac/data
+  iec:
+    enable: 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 d50d8a8..c2b7fdf 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -31,6 +31,8 @@ spring:
 
 cac:
   datapath: /home/xydl/ncac/data
+  iec:
+    enable: true
   i2:
     enable: false
     url: http://192.168.1.190:8080/busi-back-ws/service/XydlService