From 9bc378e6bb9b4563a0dec222e1c2d5d3278632cb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 17 九月 2025 17:41:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java
index f324ead..c696aa2 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java
@@ -5,6 +5,7 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.vo.GetChargingGunByChargingPileIdsVo;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.integration.drainage.TCECSuperviseUtil;
import com.ruoyi.integration.drainage.TokenUtil;
@@ -18,6 +19,8 @@
import com.ruoyi.order.api.model.TChargingBill;
import com.ruoyi.order.api.model.TChargingOrder;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.context.ApplicationListener;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -36,7 +39,7 @@
* @date 2023/7/11 8:39
*/
@Component
-public class TaskUtil {
+public class TaskUtil implements ApplicationListener<WebServerInitializedEvent> {
@Resource
@@ -52,12 +55,21 @@
@Resource
private ChargingPileClient chargingPileClient;
+
+ private Integer port = null;
+
+
+ @Override
+ public void onApplicationEvent(WebServerInitializedEvent event) {
+ port = event.getWebServer().getPort();
+ System.out.println("端口号：" + port);
+ }
+
// 每天凌晨12点30执行 推送充电用能统计
@Scheduled(cron = "0 30 0 * * ?")
public void superviseNotificationOperationStatsInfo() {
- String port = System.getProperty("server.port");
- if("5701".equals(port)){
+ if(null != port && port == 5701){
StationStatsInfoResult res = new StationStatsInfoResult();
int dayOfMonth1 = LocalDateTime.now().getYear();
int dayOfMonth2 = LocalDateTime.now().getMonthValue();
@@ -142,13 +154,14 @@
// 每15分钟执行一次的定时任务
@Scheduled(cron = "0 0/15 * * * ?")
public void supervise_notification_realtime_power_info() {
- String port = System.getProperty("server.port");
- if("5701".equals(port)){
+ if(null != port && port == 5701){
List<Site> data = siteClient.getSiteAll().getData();
List<Integer> siteIds = data.stream().filter(s->s.getStatus() == 1).map(Site::getId).collect(Collectors.toList());
List<TChargingPile> tChargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
List<Integer> collect1 = tChargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
- List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(collect1).getData();
+ GetChargingGunByChargingPileIdsVo vo = new GetChargingGunByChargingPileIdsVo();
+ vo.setChargingPileIds(collect1);
+ List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(vo).getData();
SupStationPowerInfoResult supStationPowerInfoResult = new SupStationPowerInfoResult();
List<SupStationPowerInfo> stationStatsInfos = new ArrayList<>();
LocalDateTime now = LocalDateTime.now();
--
Gitblit v1.7.1