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

1.修改基础信息配置--输电线路配置模块查询输电线路列表接口,优化代码;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import org.apache.commons.lang3.StringUtils;
-import pps.cloud.system.service.data.GetOuListTreeOutput;
 import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
 import pps.core.base.entity.*;
 import pps.core.base.mapper.*;
@@ -38,6 +37,7 @@ import xstartup.helper.XTransactionHelper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -226,7 +226,7 @@ public class BasePowerLineService {
         PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
         List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
         if (CollUtil.isNotEmpty(outputs)) {
-            List<GetOuListTreeOutput> ouInfos = DictUtils.getOuListByOuIds(
+            Map<String, String> ouMap = DictUtils.getOuListByOuIds(
                     context,
                     outputs.stream()
                             .map(QueryBasePowerLineViewOutput::getOuId)
@@ -237,11 +237,7 @@ public class BasePowerLineService {
             List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
             for (QueryBasePowerLineViewOutput output : outputs) {
                 output.setOuName(
-                        ouInfos.stream()
-                                .filter(row -> StringUtils.equals(row.getOuId(), output.getOuId()))
-                                .map(GetOuListTreeOutput::getOuName)
-                                .findAny()
-                                .orElse(null)
+                        ouMap.get(output.getOuId())
                 );
                 output.setGridTypeName(
                         DictUtils.getDicNameByStream(gridTypeList, output.getGridTypeKey())

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

@@ -10,6 +10,7 @@ import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -94,18 +95,20 @@ public class DictUtils {
      *
      * @param context 上下文
      * @param ouIds   ou id
-     * @return {@link List}<{@link GetOuListTreeOutput}>
+     * @return {@link Map}<{@link String}, {@link String}>
      */
-    public static List<GetOuListTreeOutput> getOuListByOuIds(XContext context, List<String> ouIds) {
+    public static Map<String, String> getOuListByOuIds(XContext context, List<String> ouIds) {
         GetOuListByOuIdsInput input = new GetOuListByOuIdsInput();
         input.setOuIdList(ouIds);
         SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
         XListResult<GetOuListTreeOutput> ouListByOuIds = organizationCloudService.getOuListByOuIds(context, input);
         ouListByOuIds.throwIfFail();
-        return ouListByOuIds.getResult();
+        return ouListByOuIds.getResult().stream()
+                .collect(Collectors.toMap(
+                        GetOuListTreeOutput::getOuId, GetOuListTreeOutput::getOuName
+                ));
     }
 
-
     /*-------------------------其他-------------------------*/
 
     /**