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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadView.java

@@ -73,6 +73,12 @@ public class BasePowerLineWellheadView implements Serializable {
     @TableField
     private String wellNumber;
 
+    /**
+     * 运行类型
+     */
+    @XText("运行类型key(字典获取)")
+    private String runTypeKey;
+
     /**
      * 运行功率
      */

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

@@ -213,16 +213,12 @@ public class BasePowerLineService {
         List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
         for (QueryBasePowerLineViewOutput output : outputs) {
             output.setOuName(ouName);
-            output.setGridTypeName(gridTypeList.stream()
-                    .filter(row -> StringUtils.equals(row.getDicKey(), output.getGridTypeKey()))
-                    .map(QuerySysDictionaryViewOutput::getDicName)
-                    .findAny()
-                    .orElse(null));
-            output.setLineTypeName(lineTypeList.stream()
-                    .filter(row -> StringUtils.equals(row.getDicKey(), output.getLineTypeKey()))
-                    .map(QuerySysDictionaryViewOutput::getDicName)
-                    .findAny()
-                    .orElse(null));
+            output.setGridTypeName(
+                    DictUtils.getDicNameByStream(gridTypeList, output.getGridTypeKey())
+            );
+            output.setLineTypeName(
+                    DictUtils.getDicNameByStream(lineTypeList, output.getLineTypeKey())
+            );
         }
         return XPageResult.success(outputs, input, pageInfo.getTotal());
     }
@@ -281,6 +277,14 @@ public class BasePowerLineService {
         }
         List<BasePowerLineWellheadView> selectList = wellheadViewMapper.selectList(basePowerLineWellheadView);
         List<DynamicQueryBasePowerLineWellheadViewOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineWellheadViewOutput.class);
+        if (CollectionUtil.isNotEmpty(lineOutputList)) {
+            List<QuerySysDictionaryViewOutput> dictList = DictUtils.getDictList(context, DictTypeConstant.RUN_TYPE);
+            for (DynamicQueryBasePowerLineWellheadViewOutput output : lineOutputList) {
+                output.setRunTypeValue(
+                        DictUtils.getDicNameByStream(dictList, output.getRunTypeKey())
+                );
+            }
+        }
         return XListResult.success(lineOutputList);
     }
 

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadViewOutput.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import xstartup.annotation.XText;
 
+import java.math.BigDecimal;
+
 /**
  * 输电线路井口配置
  *
@@ -22,4 +24,22 @@ public class DynamicQueryBasePowerLineWellheadViewOutput {
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    /**
+     * 运行类型
+     */
+    @XText("运行类型key(字典获取)")
+    private String runTypeKey;
+
+    /**
+     * 运行类型值
+     */
+    @XText("运行类型值")
+    private String runTypeValue;
+
+    /**
+     * 运行功率(KW)
+     */
+    @XText("运行功率(KW)")
+    private BigDecimal serviceRating;
 }

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

 package pps.core.base.utils;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
 import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
@@ -37,6 +38,21 @@ public class DictUtils {
         return dictPageResult.getResult();
     }
 
+    /**
+     * 通过字典编码匹配查询字典名称
+     *
+     * @param dictList dict类型列表
+     * @param dicKey   dic关键
+     * @return {@link String}
+     */
+    public static String getDicNameByStream(List<QuerySysDictionaryViewOutput> dictList, String dicKey) {
+        return dictList.stream()
+                .filter(row -> StringUtils.equals(row.getDicKey(), dicKey))
+                .map(QuerySysDictionaryViewOutput::getDicName)
+                .findAny()
+                .orElse(null);
+    }
+
     /**
      * 检查市电峰谷策略是否被引用
      *

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineWellheadViewMapper.xml

@@ -31,6 +31,7 @@
 
     <resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineWellheadView" extends="BaseResultMap">
         <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="run_type_key" property="runTypeKey" jdbcType="VARCHAR"/>
         <result column="service_rating" property="serviceRating" jdbcType="DECIMAL"/>
     </resultMap>
 
@@ -46,6 +47,7 @@
         SELECT l.id,
         l.wellhead_id,
         w.well_number,
+        w.run_type_key,
         w.service_rating
         FROM base_power_line_wellhead l
         LEFT JOIN base_wellhead w ON l.wellhead_id = w.id