feat(能源管理系统): 测试问题修复

1.修改间开制度管理-长期/中短期/短期间开优化定时任务,修改代码结构,处理部分未优化数据无法初始化问题;
2.修改间开制度管理-长期/中短期定时任务,修改离网型算法逻辑,优化代码;
3.修改间开制度管理-短期间开优化详情接口,优化代码;
4.修改间开制度管理-间开优化模块间开制度跟踪接口,解决短期间开制度查询多条导致程序报错问题;
5.修改间开制度管理-短期间开优化定时任务,解决重复添加短期优化记录问题;
6.修改光伏预测-查询预测列表接口,解决缺少电量值问题;
7.修改基础信息管理-井口配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
8.修改基础信息管理-光伏电站配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
9.修改基础信息管理-柴发设备配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
10.修改基础信息管理-储能设备配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
11.修改基础信息管理-光伏电站配置模块新增/修改接口,修改光伏电站表,增加字段,同时修改对应代码,修改接口优化代码结构;
12.修改基础信息管理--光伏电站配置模块详情接口,增加通过地区ID查询地区名称Cloud接口,修改代码逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -186,34 +186,33 @@ public class BasePriceStrategyService {
     public XSingleResult<GetBasePriceStrategyOutput> getBasePriceStrategy(XContext context, GetBasePriceStrategyInput input) {
         BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
         String strategyId = input.getId();
-        QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
+        BasePriceStrategyEnt entity = mapper.selectOne(new LambdaQueryWrapper<BasePriceStrategyEnt>()
                 .select(BasePriceStrategyEnt::getId,
                         BasePriceStrategyEnt::getPolicyName,
                         BasePriceStrategyEnt::getAreaCode,
                         BasePriceStrategyEnt::getStrategyYear,
                         BasePriceStrategyEnt::getIsFixedPrice,
                         BasePriceStrategyEnt::getFixedElectricityPrice)
-                .eq(BasePriceStrategyEnt::getId, strategyId);
-        BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper);
+                .eq(BasePriceStrategyEnt::getId, strategyId)
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+        );
         if (Objects.isNull(entity)) {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetBasePriceStrategyOutput output = XCopyUtils.copyNewObject(entity, GetBasePriceStrategyOutput.class);
         //查月份
         BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
-        List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonthEnt>()
-                .lambda()
+        List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new LambdaQueryWrapper<BasePriceStrategyMonthEnt>()
                 .select(BasePriceStrategyMonthEnt::getId, BasePriceStrategyMonthEnt::getStrategyMonth)
                 .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId)
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .last(" ORDER BY strategy_month + 0 ")
         );
         if (CollUtil.isNotEmpty(monthEntList)) {
             List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
             //查明细
             BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
-            List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetailEnt>()
-                    .lambda()
+            List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new LambdaQueryWrapper<BasePriceStrategyDetailEnt>()
                     .select(BasePriceStrategyDetailEnt::getStrategyMonth,
                             BasePriceStrategyDetailEnt::getPeriodTypeKey,
                             BasePriceStrategyDetailEnt::getStartTime,
@@ -221,6 +220,7 @@ public class BasePriceStrategyService {
                             BasePriceStrategyDetailEnt::getElectrovalence,
                             BasePriceStrategyDetailEnt::getInternalSettlementPrice)
                     .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
+                    .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                     .orderByAsc(BasePriceStrategyDetailEnt::getStartTime)
             );
             if (CollUtil.isNotEmpty(detailEntList)) {