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

1.修改基础信息配置--输电线路配置模块查询输电线路分页列表接口,优化代码;
2.修改基础信息配置--输电线路配置模块查询输电线路井口列表接口,优化代码;
3.修改基础信息配置--输电线路配置模块查询输电线路详情接口,优化代码;
4.修改基础信息配置--市电峰谷配置模块查询市电峰谷详情接口,优化代码;
5.修改基础信息配置模块字典工具类,优化代码;
6.修改基础信息配置--市电峰谷配置模块查询市电峰谷分页列表接口,优化代码;
7.修改task模块pom文件,添加space模块依赖引用;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -15,7 +15,7 @@ import pps.core.base.service.data.base_power_line_storage.GetBasePowerLineStorag
 import pps.core.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.core.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.core.base.service.data.base_power_line_wellhead.GetBasePowerLineWellheadViewOutput;
-import pps.core.base.utils.DictUtils;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.entity.BaseEnt;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseEntUtils;
@@ -194,15 +194,15 @@ public class BasePowerLineService {
         } else {
             output.setDieselInputs(new ArrayList<>(0));
         }
-        Map<String, String> gridTypeMap = DictUtils.getDictMap(context, DictTypeConstant.GRID_TYPE);
-        Map<String, String> lineTypeMap = DictUtils.getDictMap(context, DictTypeConstant.LINE_TYPE);
+        Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, DictTypeConstant.GRID_TYPE);
+        Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, DictTypeConstant.LINE_TYPE);
         output.setGridTypeName(
                 gridTypeMap.get(output.getGridTypeKey())
         );
         output.setLineTypeName(
                 lineTypeMap.get(output.getLineTypeKey())
         );
-        output.setOuName(DictUtils.getSysOrgNameById(context, output.getOuId()));
+        output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId()));
         return XSingleResult.success(output);
     }
 
@@ -220,20 +220,20 @@ public class BasePowerLineService {
         BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class);
         BasePowerLineView lineView = XCopyUtils.copyNewObject(input, BasePowerLineView.class);
         PageMethod.startPage(input.getPage(), input.getLimit());
-        lineView.setOuList(DictUtils.getOrgIdsByPath(context, lineView.getOuId()));
+        lineView.setOuList(ServiceUtil.getOrgIdsByPath(context, lineView.getOuId()));
         List<BasePowerLineView> list = mapper.selectList(lineView);
         PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
         List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
         if (CollUtil.isNotEmpty(outputs)) {
-            Map<String, String> ouMap = DictUtils.getOuMapByOuIds(
+            Map<String, String> ouMap = ServiceUtil.getOuMapByOuIds(
                     context,
                     outputs.stream()
                             .map(QueryBasePowerLineViewOutput::getOuId)
                             .distinct()
                             .collect(Collectors.toList())
             );
-            Map<String, String> gridTypeMap = DictUtils.getDictMap(context, DictTypeConstant.GRID_TYPE);
-            Map<String, String> lineTypeMap = DictUtils.getDictMap(context, DictTypeConstant.LINE_TYPE);
+            Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, DictTypeConstant.GRID_TYPE);
+            Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, DictTypeConstant.LINE_TYPE);
             for (QueryBasePowerLineViewOutput output : outputs) {
                 output.setOuName(
                         ouMap.get(output.getOuId())
@@ -304,7 +304,7 @@ public class BasePowerLineService {
         List<BasePowerLineWellheadView> selectList = wellheadViewMapper.selectList(basePowerLineWellheadView);
         List<DynamicQueryBasePowerLineWellheadViewOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineWellheadViewOutput.class);
         if (CollUtil.isNotEmpty(lineOutputList)) {
-            Map<String, String> dictMap = DictUtils.getDictMap(context, DictTypeConstant.RUN_TYPE);
+            Map<String, String> dictMap = ServiceUtil.getDictMap(context, DictTypeConstant.RUN_TYPE);
             for (DynamicQueryBasePowerLineWellheadViewOutput output : lineOutputList) {
                 output.setRunTypeValue(
                         dictMap.get(output.getRunTypeKey())

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

@@ -13,7 +13,7 @@ import pps.core.base.service.data.base_price_strategy_detail.GetBasePriceStrateg
 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.base.utils.ServiceUtil;
 import pps.core.common.entity.BaseEnt;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseEntUtils;
@@ -210,7 +210,7 @@ public class BasePriceStrategyService {
                             BasePriceStrategyDetailEnt::getInternalSettlementPrice)
                     .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
             if (CollUtil.isNotEmpty(detailEntList)) {
-                Map<String, String> dictMap = DictUtils.getDictMap(context, DictTypeConstant.TIME_FRAME);
+                Map<String, String> dictMap = ServiceUtil.getDictMap(context, DictTypeConstant.TIME_FRAME);
                 List<GetBasePriceStrategyDetailOutput> detailOutputs = XCopyUtils.copyNewList(detailEntList, GetBasePriceStrategyDetailOutput.class);
                 for (GetBasePriceStrategyDetailOutput detailOutput : detailOutputs) {
                     detailOutput.setPeriodTypeValue(
@@ -250,7 +250,7 @@ public class BasePriceStrategyService {
         PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
         List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
         if (CollUtil.isNotEmpty(outputs)) {
-            Map<Integer, String> areaMap = DictUtils.getSysAreaMap(context);
+            Map<Integer, String> areaMap = ServiceUtil.getSysAreaMap(context);
             for (QueryBasePriceStrategyViewOutput output : outputs) {
                 output.setAreaName(
                         areaMap.get(output.getAreaCode())

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

@@ -14,12 +14,12 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
- * 封装工具类
+ * 常用服务调用工具类
  *
  * @author ZWT
  * @date 2023/08/25 16:08
  */
-public class DictUtils {
+public class ServiceUtil {
 
     /*-------------------------服务调用-------------------------*/