From b5e17378287084f13fcff34ebb148f65624aa495 Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 7 Jan 2025 13:45:33 +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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 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 aff757a..709f1ca 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 @@ -113,20 +113,31 @@ public class EnergyUsageFlowServiceImpl implements EnergyUsageFlowService { request.setBeginTime(DateTimeUtils.getYearBeginTime(DateTimeUtils.getYearBeginDate())); request.setEndTime(DateTimeUtils.getYearEndTime()); } + List summaryList = new ArrayList<>(); + List 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 carbonEnergyVarietyDTOS = commonService.energyVarietyList(varietyReqDTO); if(CollectionUtil.isEmpty(carbonEnergyVarietyDTOS)){ - return null; + return summaryList; } - List 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; }