feat(能源管理系统): 基础信息配置

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;
3.修改基础信息配置模块业务工具类,增加匹配查询地区名称方法;
4.修改基础信息配置模块业务工具类,增加匹配查询组织名称方法;
5.修改基础信息配置--市电峰谷配置模块详情接口,增加时段类型值返回结果字段;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java

@@ -7,9 +7,11 @@ import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.data.GetSysAreaOutput;
+import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
 import pps.core.base.entity.*;
 import pps.core.base.mapper.*;
 import pps.core.base.service.data.base_price_strategy.*;
+import pps.core.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
 import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput;
 import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
 import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
@@ -17,6 +19,7 @@ import pps.core.base.utils.DictUtils;
 import pps.core.common.entity.BaseEnt;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseEntUtils;
+import pps.core.system.constant.DictTypeConstant;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -195,6 +198,7 @@ public class BasePriceStrategyService {
                 .select(BasePriceStrategyMonthEnt::getId, BasePriceStrategyMonthEnt::getStrategyMonth)
                 .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
         if (CollUtil.isNotEmpty(monthEntList)) {
+            List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
             //查明细
             BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
             List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetailEnt>()
@@ -207,13 +211,19 @@ public class BasePriceStrategyService {
                             BasePriceStrategyDetailEnt::getInternalSettlementPrice)
                     .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
             if (CollUtil.isNotEmpty(detailEntList)) {
-                Map<Integer, List<BasePriceStrategyDetailEnt>> collect = detailEntList.stream()
-                        .collect(Collectors.groupingBy(BasePriceStrategyDetailEnt::getStrategyMonth));
-                for (BasePriceStrategyMonthEnt monthEnt : monthEntList) {
-                    monthEnt.setDetails(collect.get(monthEnt.getStrategyMonth()));
+                List<QuerySysDictionaryViewOutput> dictList = DictUtils.getDictList(context, DictTypeConstant.TIME_FRAME);
+                List<GetBasePriceStrategyDetailOutput> detailOutputs = XCopyUtils.copyNewList(detailEntList, GetBasePriceStrategyDetailOutput.class);
+                for (GetBasePriceStrategyDetailOutput detailOutput : detailOutputs) {
+                    detailOutput.setPeriodTypeValue(
+                            DictUtils.getDicNameByStream(dictList, detailOutput.getPeriodTypeKey())
+                    );
+                }
+                Map<Integer, List<GetBasePriceStrategyDetailOutput>> collect = detailOutputs.stream()
+                        .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyMonth));
+                for (GetBasePriceStrategyMonthOutput monthOutput : months) {
+                    monthOutput.setDetails(collect.get(monthOutput.getStrategyMonth()));
                 }
             }
-            List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
             output.setMonths(months);
         }
         return XSingleResult.success(output);

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailOutput.java

@@ -32,4 +32,10 @@ public class GetBasePriceStrategyDetailOutput {
 
     @XText("内部结算价")
     private BigDecimal internalSettlementPrice;
+
+    /**
+     * 时段类型值
+     */
+    @XText("时段类型值")
+    private String periodTypeValue;
 }