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