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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

 package pps.core.base.service;
 
-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -157,7 +157,7 @@ public class BasePowerLineService {
         List<BasePowerLineWellheadView> wellheadViewList = wellheadViewMapper.selectList(BasePowerLineWellheadView.builder()
                 .lineId(lineId)
                 .build());
-        if (CollectionUtil.isNotEmpty(wellheadViewList)) {
+        if (CollUtil.isNotEmpty(wellheadViewList)) {
             output.setWellheadOutputs(XCopyUtils.copyNewList(wellheadViewList, GetBasePowerLineWellheadViewOutput.class));
         }
         //设置关联光伏
@@ -165,7 +165,7 @@ public class BasePowerLineService {
         List<BasePowerLinePlantView> plantViewList = plantViewMapper.selectList(BasePowerLinePlantView.builder()
                 .lineId(lineId)
                 .build());
-        if (CollectionUtil.isNotEmpty(plantViewList)) {
+        if (CollUtil.isNotEmpty(plantViewList)) {
             output.setPlantOutputs(XCopyUtils.copyNewList(plantViewList, GetBasePowerLinePlantViewOutput.class));
         }
         //设置关联储能
@@ -173,7 +173,7 @@ public class BasePowerLineService {
         List<BasePowerLineStorageView> storageViewList = storageViewMapper.selectList(BasePowerLineStorageView.builder()
                 .lineId(lineId)
                 .build());
-        if (CollectionUtil.isNotEmpty(storageViewList)) {
+        if (CollUtil.isNotEmpty(storageViewList)) {
             output.setStorageOutputs(XCopyUtils.copyNewList(storageViewList, GetBasePowerLineStorageViewOutput.class));
         }
         //设置关联柴发
@@ -181,7 +181,7 @@ public class BasePowerLineService {
         List<BasePowerLineDieselView> dieselViewList = dieselViewMapper.selectList(BasePowerLineDieselView.builder()
                 .lineId(lineId)
                 .build());
-        if (CollectionUtil.isNotEmpty(dieselViewList)) {
+        if (CollUtil.isNotEmpty(dieselViewList)) {
             output.setDieselOutputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class));
         }
         return XSingleResult.success(output);
@@ -204,7 +204,7 @@ public class BasePowerLineService {
         List<BasePowerLineView> list = mapper.selectList(record);
         PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
         List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
-        if (CollectionUtil.isNotEmpty(outputs)) {
+        if (CollUtil.isNotEmpty(outputs)) {
             String ouName = DictUtils.getSysOrgNameById(context, input.getOuId());
             List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE);
             List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
@@ -275,7 +275,7 @@ public class BasePowerLineService {
         }
         List<BasePowerLineWellheadView> selectList = wellheadViewMapper.selectList(basePowerLineWellheadView);
         List<DynamicQueryBasePowerLineWellheadViewOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineWellheadViewOutput.class);
-        if (CollectionUtil.isNotEmpty(lineOutputList)) {
+        if (CollUtil.isNotEmpty(lineOutputList)) {
             List<QuerySysDictionaryViewOutput> dictList = DictUtils.getDictList(context, DictTypeConstant.RUN_TYPE);
             for (DynamicQueryBasePowerLineWellheadViewOutput output : lineOutputList) {
                 output.setRunTypeValue(
@@ -315,7 +315,7 @@ public class BasePowerLineService {
     private void saveLineRelation(String lineId, String ouId, PpsUserSession session,
                                   List wellheadInputs, List plantInputs, List storageInputs, List dieselInputs) {
         //新增井口配置
-        if (CollectionUtil.isNotEmpty(wellheadInputs)) {
+        if (CollUtil.isNotEmpty(wellheadInputs)) {
             List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class);
             for (BasePowerLineWellheadEnt wellhead : wellheads) {
                 wellhead.setLineId(lineId);
@@ -325,7 +325,7 @@ public class BasePowerLineService {
             BaseEntUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads);
         }
         //新增光伏配置
-        if (CollectionUtil.isNotEmpty(plantInputs)) {
+        if (CollUtil.isNotEmpty(plantInputs)) {
             List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class);
             for (BasePowerLinePlantEnt plant : plants) {
                 plant.setLineId(lineId);
@@ -335,7 +335,7 @@ public class BasePowerLineService {
             BaseEntUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants);
         }
         //新增储能配置
-        if (CollectionUtil.isNotEmpty(storageInputs)) {
+        if (CollUtil.isNotEmpty(storageInputs)) {
             List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class);
             for (BasePowerLineStorageEnt storage : storages) {
                 storage.setLineId(lineId);
@@ -345,7 +345,7 @@ public class BasePowerLineService {
             BaseEntUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages);
         }
         //新增柴发配置
-        if (CollectionUtil.isNotEmpty(dieselInputs)) {
+        if (CollUtil.isNotEmpty(dieselInputs)) {
             List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class);
             for (BasePowerLineDieselEnt diesel : diesels) {
                 diesel.setLineId(lineId);

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

 package pps.core.base.service;
 
-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -65,7 +65,7 @@ public class BasePriceStrategyService {
             mapper.insert(entity);
             String strategyId = entity.getId();
             List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
-            if (CollectionUtil.isNotEmpty(inputMonths)) {
+            if (CollUtil.isNotEmpty(inputMonths)) {
                 List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
                 BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
                 this.saveStrategyMonthDetail(monthMapper, monthList, strategyId, session);
@@ -95,7 +95,7 @@ public class BasePriceStrategyService {
                 return XServiceResult.error(context, XError.NotFound);
             }
             List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
-            if (CollectionUtil.isNotEmpty(inputMonths)) {
+            if (CollUtil.isNotEmpty(inputMonths)) {
                 List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
                 List<Integer> collect = monthList.stream()
                         .map(BasePriceStrategyMonthEnt::getStrategyMonth)
@@ -194,7 +194,7 @@ public class BasePriceStrategyService {
                 .lambda()
                 .select(BasePriceStrategyMonthEnt::getId, BasePriceStrategyMonthEnt::getStrategyMonth)
                 .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
-        if (CollectionUtil.isNotEmpty(monthEntList)) {
+        if (CollUtil.isNotEmpty(monthEntList)) {
             //查明细
             BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
             List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetailEnt>()
@@ -206,7 +206,7 @@ public class BasePriceStrategyService {
                             BasePriceStrategyDetailEnt::getElectrovalence,
                             BasePriceStrategyDetailEnt::getInternalSettlementPrice)
                     .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
-            if (CollectionUtil.isNotEmpty(detailEntList)) {
+            if (CollUtil.isNotEmpty(detailEntList)) {
                 Map<Integer, List<BasePriceStrategyDetailEnt>> collect = detailEntList.stream()
                         .collect(Collectors.groupingBy(BasePriceStrategyDetailEnt::getStrategyMonth));
                 for (BasePriceStrategyMonthEnt monthEnt : monthEntList) {
@@ -236,7 +236,7 @@ public class BasePriceStrategyService {
         List<BasePriceStrategyView> list = mapper.selectList(record);
         PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
         List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
-        if (CollectionUtil.isNotEmpty(outputs)) {
+        if (CollUtil.isNotEmpty(outputs)) {
             List<GetSysAreaOutput> sysAreaOutputList = DictUtils.getSysAreaOutputList(context);
             for (QueryBasePriceStrategyViewOutput output : outputs) {
                 output.setAreaName(