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 summaryList = new ArrayList<>(); - List thingIds = request.getThingIds(); - if(CollectionUtil.isEmpty(thingIds)){ - return summaryList; - } + //List 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;