From 05626a9f0f93a042477e8bb53fe5660e5d18b134 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 27 八月 2026 10:40:06 +0800
Subject: [PATCH] feat(api): 添加数据推送配置和定时任务功能
---
ruoyi-admin/src/main/resources/application-jlmy.yml | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/core/api/ScheduledApi.java | 29 +++++++++++++++++++++++++++--
ruoyi-admin/src/main/resources/application-zd.yml | 14 ++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/api/ScheduledApi.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/api/ScheduledApi.java
index 599f692..82c21cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/api/ScheduledApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/api/ScheduledApi.java
@@ -10,6 +10,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -23,6 +26,15 @@
@Slf4j
//姒嗘灄甯傚伐涓氬拰淇℃伅鍖栧眬鏁版嵁鎺ㄩ��(瀹氭椂浠诲姟)
public class ScheduledApi {
+
+ @Value("${api.loggingEnabled:false}")
+ private boolean loggingEnabled;
+
+ @Value("${api.electricityEnabled:false}")
+ private boolean electricityEnabled;
+
+ @Value("${api.ip}")
+ private String apiIp;
@Value("${api.entName}")
private String entName;
@@ -48,9 +60,19 @@
private static final Random RANDOM = new Random();
+ @EventListener(ApplicationReadyEvent.class)
+ public void logPushStatus() {
+ log.info("姒嗘灄甯傚伐涓氬拰淇℃伅鍖栧眬鏁版嵁鎺ㄩ�侀厤缃細鐧诲綍鏃ュ織鎺ㄩ�亄}锛岀數閲忔暟鎹帹閫亄}锛屾帹閫佸湴鍧�锛歿}锛屼紒涓氾細{}",
+ loggingEnabled ? "宸插紑鍚�" : "宸插叧闂�",
+ electricityEnabled ? "宸插紑鍚�" : "宸插叧闂�", apiIp, entName);
+ }
+
//鎺ㄩ�佺櫥褰曟棩蹇楁瘡鍛�
-// @Scheduled(cron = "0 0 1 ? * 1")
+ @Scheduled(cron = "0 0 1 ? * 1")
public void logging(){
+ if (!loggingEnabled) {
+ return;
+ }
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:dd");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鑾峰彇鐧诲綍鏃ュ織
@@ -80,8 +102,11 @@
}
//鎺ㄩ�佺數姣忔湀
-// @Scheduled(cron = "0 0 1 1 * ?")
+ @Scheduled(cron = "0 0 1 1 * ?")
public void electricity(){
+ if (!electricityEnabled) {
+ return;
+ }
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:dd");
//鑾峰彇鐧诲綍鏃ュ織
List<ElectricityDto> electricityDtos = new ArrayList<>();
diff --git a/ruoyi-admin/src/main/resources/application-jlmy.yml b/ruoyi-admin/src/main/resources/application-jlmy.yml
index 192f12c..4a2678f 100644
--- a/ruoyi-admin/src/main/resources/application-jlmy.yml
+++ b/ruoyi-admin/src/main/resources/application-jlmy.yml
@@ -132,6 +132,8 @@
#姒嗘灄甯傚伐涓氬拰淇℃伅鍖栧眬鏁版嵁鎺ㄩ��
api:
+ loggingEnabled: true #鏄惁鎺ㄩ�佺櫥褰曟棩蹇�
+ electricityEnabled: true #鏄惁鎺ㄩ�佺數閲忔暟鎹�
ip: http://111.20.184.155:8888 #鎺ㄩ�乮p鍦板潃
appid: 48b97e28e0aad7963e96fc50b9e63908 #浼佷笟搴旂敤id
secret: 0db7a9fa112427df622c4207b4707432 #浼佷笟搴旂敤绉橀挜
diff --git a/ruoyi-admin/src/main/resources/application-zd.yml.example b/ruoyi-admin/src/main/resources/application-zd.yml
similarity index 84%
rename from ruoyi-admin/src/main/resources/application-zd.yml.example
rename to ruoyi-admin/src/main/resources/application-zd.yml
index af616f7..35685f3 100644
--- a/ruoyi-admin/src/main/resources/application-zd.yml.example
+++ b/ruoyi-admin/src/main/resources/application-zd.yml
@@ -91,6 +91,20 @@
max-wait: -1ms
# 瀹㈡埛鏈嶅姟鍣� minio
+#姒嗘灄甯傚伐涓氬拰淇℃伅鍖栧眬鏁版嵁鎺ㄩ��
+api:
+ loggingEnabled: false #鏄惁鎺ㄩ�佺櫥褰曟棩蹇�
+ electricityEnabled: false #鏄惁鎺ㄩ�佺數閲忔暟鎹�
+ ip: http://111.20.184.155:8888 #鎺ㄩ�乮p鍦板潃
+ appid: 48b97e28e0aad7963e96fc50b9e63908 #浼佷笟搴旂敤id
+ secret: 0db7a9fa112427df622c4207b4707432 #浼佷笟搴旂敤绉橀挜
+ entName: 绁炴湪甯傝仛鍔涚叅涓氭湁闄愬叕鍙� #浼佷笟鍚嶇О
+ socialCreditCode: 91610821305529570Q #缁熶竴绀句細淇＄敤浠ｇ爜
+ dayPowerConsumption: 1200 #鏃ュ潎鐢ㄧ數閲�
+ outputValuesBase: 2200 #鍗曚綅浜у�煎熀鏁帮紙涓囧厓锛�
+ electricityCost: 1200 #鏈堢數璐�
+
+# 瀹㈡埛鏈嶅姟鍣� minio
minio:
endpoint: 127.0.0.1
port: 9000
--
Gitblit v1.9.3