From 2e44b182b43fecaf6a2510c9226f18ffd2cee6c9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 四月 2025 17:33:46 +0800
Subject: [PATCH] 监管平台调试完毕

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TaskUtil.java |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 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 84dfe16..3df2601 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
@@ -53,25 +53,17 @@
     @Resource
     private ChargingPileClient chargingPileClient;
 
-
-
     // 每天凌晨12点30执行 推送充电用能统计
     @Scheduled(cron = "0 30 0 * * ?")
     public void superviseNotificationOperationStatsInfo() {
         StationStatsInfoResult res = new StationStatsInfoResult();
-
+        int dayOfMonth1 = LocalDateTime.now().getYear();
+        int dayOfMonth2 = LocalDateTime.now().getMonthValue();
+        int dayOfMonth3 = LocalDateTime.now().getDayOfMonth();
         List<Site> data = siteClient.getSiteAll().getData();
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime startLocalDateTime = now.minusDays(1);
-        LocalDateTime endLocalDateTime = now.minusDays(1);
-        // 获取今天凌晨
-        startLocalDateTime.withHour(0);
-        startLocalDateTime.withMinute(0);
-        startLocalDateTime.withSecond(0);
+        LocalDateTime startLocalDateTime = LocalDateTime.of(dayOfMonth1, dayOfMonth2, dayOfMonth3, 0, 0, 0);
+        LocalDateTime endLocalDateTime = LocalDateTime.of(dayOfMonth1, dayOfMonth2, dayOfMonth3, 23, 59, 59);
         String start = DateUtils.localDateTimeToString(startLocalDateTime);
-        endLocalDateTime.withHour(23);
-        endLocalDateTime.withMinute(59);
-        endLocalDateTime.withSecond(59);
         String end = DateUtils.localDateTimeToString(endLocalDateTime);
         ChargingStatisticeDTO chargingStatisticeDTO = new ChargingStatisticeDTO();
         chargingStatisticeDTO.setStartTime(startLocalDateTime);
@@ -172,10 +164,9 @@
             BigDecimal divide = collect.stream().map(TChargingOrder::getChargingPower).reduce(BigDecimal::add).get().divide(new BigDecimal(collect.size()).setScale(4, BigDecimal.ROUND_DOWN));
             supStationPowerInfo.setStationRealTimePower(divide);
             supStationPowerInfo.setEquipmentPowerInfos(buildEquipmentPowerInfo(datum.getId(), tChargingPiles, chargingGunList));
-
             stationStatsInfos.add(supStationPowerInfo);
         }
-        supStationPowerInfoResult.setStationStatsInfos(stationStatsInfos);
+        supStationPowerInfoResult.setSupStationPowerInfos(stationStatsInfos);
         tcecSuperviseUtil.superviseNotificationRealtimePowerInfo(supStationPowerInfoResult);
 
     }

--
Gitblit v1.7.1