diff --git a/lzbi-admin/src/main/resources/application.yml b/lzbi-admin/src/main/resources/application.yml index 3466c76..9af1cf0 100644 --- a/lzbi-admin/src/main/resources/application.yml +++ b/lzbi-admin/src/main/resources/application.yml @@ -60,7 +60,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: test # 文件上传 servlet: multipart: diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/MultiOrgSomeReportEverydayData.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/MultiOrgSomeReportEverydayData.java index 6eceb21..6d9533e 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/MultiOrgSomeReportEverydayData.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/MultiOrgSomeReportEverydayData.java @@ -1,12 +1,16 @@ package com.lzbi.bi.domain.dto; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; /** * 多组织某个图标每一天的数据 */ +@AllArgsConstructor +@NoArgsConstructor @Data public class MultiOrgSomeReportEverydayData { diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java index e9a1b11..dc196ea 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java @@ -1,6 +1,7 @@ package com.lzbi.bi.mapper; import com.alibaba.fastjson2.JSONObject; +import com.lzbi.bi.domain.dto.MultiOrgSomeReportEverydayData; import com.lzbi.bi.domain.req.ParamSummarizingDataReq; import com.lzbi.bi.domain.vo.MapOrgVO; import com.lzbi.common.constant.BizConstants; @@ -189,4 +190,10 @@ public class ScreenMockDataMapper { public int selectSomeOrgHeatExchangeStationCount(Long orgId) { return 50; } + + public List selectChildOrgSomeReportEverydayDataList(ReportDataReq reportDataReq) { + List result = new ArrayList<>(); + result.add(new MultiOrgSomeReportEverydayData(103L, "浑南一号源", "2023-11-01", BigDecimal.valueOf(2500))); + return result; + } } diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java index 1d14eec..76f828a 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java @@ -25,6 +25,7 @@ import com.lzbi.common.utils.bean.BeanUtils; import com.lzbi.draft.domain.vo.*; import com.lzbi.draft.service.DcBusiTargetDraftDaynewService; import com.lzbi.system.service.ISysDeptService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -45,6 +46,7 @@ import static java.util.stream.Collectors.groupingBy; * @author : zhousq * @date : 2023-11-16 */ +@Slf4j @Service public class DcBusiDataScreenMainService extends ServiceImpl implements IService { @@ -56,6 +58,7 @@ public class DcBusiDataScreenMainService extends ServiceImpl result = new ArrayList<>(); this.buildChildrenOrgReportDataReq(reportDataReq); this.buildHeatingDate(reportDataReq); - List multiOrgSomeReportEverydayDataList = baseMapper.selectChildOrgSomeReportEverydayDataList(reportDataReq); - if (!CollectionUtils.isEmpty(multiOrgSomeReportEverydayDataList)) { + List data = baseMapper.selectChildOrgSomeReportEverydayDataList(reportDataReq); + log.info("排名数据:{}", JSONArray.toJSONString(data)); + if (!CollectionUtils.isEmpty(data)) { // 排序后的日期列表 - List dateSoredList = multiOrgSomeReportEverydayDataList.stream().map(MultiOrgSomeReportEverydayData::getDate).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList()); + List dateSoredList = data.stream().map(MultiOrgSomeReportEverydayData::getDate).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList()); // 排序后的组织id列表 - List orgIdSoredList = multiOrgSomeReportEverydayDataList.stream().map(MultiOrgSomeReportEverydayData::getOrgId).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList()); + List orgIdSoredList = data.stream().map(MultiOrgSomeReportEverydayData::getOrgId).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList()); // 组织map - Map orgMap = multiOrgSomeReportEverydayDataList.stream().collect(Collectors.toMap(MultiOrgSomeReportEverydayData::getOrgId, MultiOrgSomeReportEverydayData::getOrgName, (v1, v2) -> v2)); + Map orgMap = data.stream().collect(Collectors.toMap(MultiOrgSomeReportEverydayData::getOrgId, MultiOrgSomeReportEverydayData::getOrgName, (v1, v2) -> v2)); // 按日期分组的map - Map> groupDateMap = multiOrgSomeReportEverydayDataList.stream().collect(groupingBy(MultiOrgSomeReportEverydayData::getDate)); + Map> groupDateMap = data.stream().collect(groupingBy(MultiOrgSomeReportEverydayData::getDate)); dateSoredList.forEach(date -> { SomeReportDataRankingVO someReportDataRankingVO = new SomeReportDataRankingVO(); someReportDataRankingVO.setCdate(date); - List data = groupDateMap.get(date); - Map orgIdMap = data.stream().collect(Collectors.toMap(MultiOrgSomeReportEverydayData::getOrgId, item -> item, (v1, v2) -> v1)); + List dateData = groupDateMap.get(date); + Map orgIdMap = dateData.stream().collect(Collectors.toMap(MultiOrgSomeReportEverydayData::getOrgId, item -> item, (v1, v2) -> v1)); List orgNameList = new ArrayList<>(); List valueList = new ArrayList<>(); orgIdSoredList.forEach(orgId -> {