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

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
-import pps.cloud.system.service.SystemAreaService;
-import pps.cloud.system.service.data.GetSysAreaInput;
 import pps.cloud.system.service.data.GetSysAreaOutput;
 import pps.core.base.entity.*;
 import pps.core.base.mapper.*;
@@ -15,6 +13,7 @@ import pps.core.base.service.data.base_price_strategy.*;
 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;
+import pps.core.base.utils.DictUtils;
 import pps.core.common.entity.BaseEnt;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseEntUtils;
@@ -237,13 +236,13 @@ public class BasePriceStrategyService {
         List<BasePriceStrategyView> list = mapper.selectList(record);
         PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
         List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
-        List<GetSysAreaOutput> sysAreaOutputList = this.getSysAreaOutputList(context);
-        for (QueryBasePriceStrategyViewOutput output : outputs) {
-            output.setAreaName(sysAreaOutputList.stream()
-                    .filter(area -> StringUtils.equals(output.getAreaCode(), String.valueOf(area.getId())))
-                    .map(GetSysAreaOutput::getName)
-                    .findAny()
-                    .orElse("其他地区"));
+        if (CollectionUtil.isNotEmpty(outputs)) {
+            List<GetSysAreaOutput> sysAreaOutputList = DictUtils.getSysAreaOutputList(context);
+            for (QueryBasePriceStrategyViewOutput output : outputs) {
+                output.setAreaName(
+                        DictUtils.getAreaNameByStream(sysAreaOutputList, output.getAreaCode())
+                );
+            }
         }
         return XPageResult.success(outputs, input, pageInfo.getTotal());
     }
@@ -295,19 +294,6 @@ public class BasePriceStrategyService {
         return count > 0;
     }
 
-    /**
-     * 获得系统输出列表区域
-     *
-     * @param context 上下文
-     * @return {@link List}<{@link GetSysAreaOutput}>
-     */
-    private List<GetSysAreaOutput> getSysAreaOutputList(XContext context) {
-        SystemAreaService systemAreaService = context.getBean(SystemAreaService.class);
-        XListResult<GetSysAreaOutput> sysAreaList = systemAreaService.getSysAreaList(context, new GetSysAreaInput());
-        sysAreaList.throwIfFail();
-        return sysAreaList.getResult();
-    }
-
     /**
      * 保存策略明细
      *

C09-base/pps-core-base/src/main/java/pps/core/base/utils/DictUtils.java

@@ -2,11 +2,9 @@ package pps.core.base.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SysOrganizationCloudService;
+import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.GetSysOrganizationViewInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.*;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
@@ -60,6 +58,19 @@ public class DictUtils {
                 .orElse(null);
     }
 
+    /**
+     * 获得系统输出列表区域
+     *
+     * @param context 上下文
+     * @return {@link List}<{@link GetSysAreaOutput}>
+     */
+    public static List<GetSysAreaOutput> getSysAreaOutputList(XContext context) {
+        SystemAreaService systemAreaService = context.getBean(SystemAreaService.class);
+        XListResult<GetSysAreaOutput> sysAreaList = systemAreaService.getSysAreaList(context, new GetSysAreaInput());
+        sysAreaList.throwIfFail();
+        return sysAreaList.getResult();
+    }
+
     /*-------------------------其他-------------------------*/
 
     /**
@@ -76,4 +87,19 @@ public class DictUtils {
                 .findAny()
                 .orElse(null);
     }
+
+    /**
+     * 通过地区ID匹配查询地区名称
+     *
+     * @param areaList 区域列表
+     * @param areaCode 区号
+     * @return {@link String}
+     */
+    public static String getAreaNameByStream(List<GetSysAreaOutput> areaList, String areaCode) {
+        return areaList.stream()
+                .filter(area -> StringUtils.equals(String.valueOf(area.getId()), areaCode))
+                .map(GetSysAreaOutput::getName)
+                .findAny()
+                .orElse("其他地区");
+    }
 }
\ No newline at end of file