Browse Source

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

2025年1月7日11:38:25
qingyuan_dev_new
lishuai 1 year ago
parent
commit
0b2104fcf5
  1. 18
      modules/report-analysis/src/main/java/com/thing/carbon/energyrepory/service/impl/EnergyUsageFlowServiceImpl.java

18
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;

Loading…
Cancel
Save