From 0b2104fcf5c5119e37465daea211b8c9ce37edb7 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 7 Jan 2025 14:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E6=B5=81=E5=9B=BE=E7=9A=84=E8=A1=8D?=
 =?UTF-8?q?=E7=94=9F=EF=BC=8C=E6=97=B6=E9=97=B4=E5=8A=A8=E6=80=81bug=20202?=
 =?UTF-8?q?5=E5=B9=B41=E6=9C=887=E6=97=A511:38:25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EnergyUsageFlowServiceImpl.java       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java
index 709f1ca..54d1e28 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java
@@ -114,10 +114,10 @@ public class EnergyUsageFlowServiceImpl implements EnergyUsageFlowService {
             request.setEndTime(DateTimeUtils.getYearEndTime());
         }
         List<EnergyUsageSummaryDTO> summaryList = new ArrayList<>();
-        List<Long> thingIds = request.getThingIds();
-        if(CollectionUtil.isEmpty(thingIds)){
-            return summaryList;
-        }
+        //List<Long> thingIds = request.getThingIds();
+//        if(CollectionUtil.isEmpty(thingIds)){
+//            return summaryList;
+//        }
 
         CarbonEnergyVarietyReqDTO varietyReqDTO = new CarbonEnergyVarietyReqDTO();
         varietyReqDTO.setThingId(request.getThingId());
@@ -131,12 +131,10 @@ public class EnergyUsageFlowServiceImpl implements EnergyUsageFlowService {
         }
         for (CarbonEnergyVarietyDTO carbonEnergyVarietyDTO : carbonEnergyVarietyDTOS) {
             request.setEnergyVarietyId(carbonEnergyVarietyDTO.getId());
-            for (Long thingId : thingIds) {
-                request.setThingIds(Arrays.asList(thingId));
-                EnergyUsageSummaryDTO flowSummary = getFlowSummary(request);
-                if(!Objects.isNull(flowSummary)){
-                    summaryList.add(flowSummary);
-                }
+            request.setThingIds(request.getThingIds());
+            EnergyUsageSummaryDTO flowSummary = getFlowSummary(request);
+            if(!Objects.isNull(flowSummary)){
+                summaryList.add(flowSummary);
             }
         }
         return summaryList;