能流图的衍生，时间动态bug

2025年1月7日11:38:25

modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java

@@ -113,20 +113,31 @@ public class EnergyUsageFlowServiceImpl implements EnergyUsageFlowService {
             request.setBeginTime(DateTimeUtils.getYearBeginTime(DateTimeUtils.getYearBeginDate()));
             request.setEndTime(DateTimeUtils.getYearEndTime());
         }
+        List<EnergyUsageSummaryDTO> summaryList = new ArrayList<>();
+        List<Long> thingIds = request.getThingIds();
+        if(CollectionUtil.isEmpty(thingIds)){
+            return summaryList;
+        }
+
         CarbonEnergyVarietyReqDTO varietyReqDTO = new CarbonEnergyVarietyReqDTO();
         varietyReqDTO.setThingId(request.getThingId());
         varietyReqDTO.setRootId(request.getRootId());
         varietyReqDTO.setRootThingId(request.getRootThingId());
         varietyReqDTO.setAttrType(request.getAttrType());
+        varietyReqDTO.setAttrType(request.getAttrType());
         List<CarbonEnergyVarietyDTO> carbonEnergyVarietyDTOS = commonService.energyVarietyList(varietyReqDTO);
         if(CollectionUtil.isEmpty(carbonEnergyVarietyDTOS)){
-            return null;
+            return summaryList;
         }
-        List<EnergyUsageSummaryDTO> summaryList = new ArrayList<>();
         for (CarbonEnergyVarietyDTO carbonEnergyVarietyDTO : carbonEnergyVarietyDTOS) {
             request.setEnergyVarietyId(carbonEnergyVarietyDTO.getId());
-            EnergyUsageSummaryDTO flowSummary = getFlowSummary(request);
-            summaryList.add(flowSummary);
+            for (Long thingId : thingIds) {
+                request.setThingIds(Arrays.asList(thingId));
+                EnergyUsageSummaryDTO flowSummary = getFlowSummary(request);
+                if(!Objects.isNull(flowSummary)){
+                    summaryList.add(flowSummary);
+                }
+            }
         }
         return summaryList;
     }