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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -354,6 +354,38 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         });
     }
 
+    /**
+     * 间开优化历史--分页列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QueryOptimizeHistoryViewOutput}>
+     */
+    @XApiAnonymous
+    @XApiGet
+    @XText("间开优化历史--分页列表")
+    public XPageResult<QueryOptimizeHistoryViewOutput> queryOptimizeHistoryView(XContext context, QueryOptimizeHistoryViewInput input) {
+        SpaceInstitutionDetailViewMapper mapper = context.getBean(SpaceInstitutionDetailViewMapper.class);
+        PageHelper.startPage(input.getPage(), input.getLimit());
+        List<SpaceInstitutionDetailView> historyList = mapper.selectOptimizeHistoryList(SpaceInstitutionDetailView.builder()
+                .ouId(input.getOuId())
+                .build()
+        );
+        PageInfo<SpaceInstitutionDetailView> pageInfo = new PageInfo<>(historyList);
+        List<QueryOptimizeHistoryViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryOptimizeHistoryViewOutput.class);
+        if (CollUtil.isNotEmpty(outputs)) {
+            Map<String, String> lineNameMap = ServiceUtil.getPowerLineNameMap(context, outputs.stream()
+                    .map(QueryOptimizeHistoryViewOutput::getLineId)
+                    .distinct()
+                    .collect(Collectors.toList())
+            );
+            outputs.forEach(o -> o.setLineName(lineNameMap.get(o.getLineId())));
+        }
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    }
+
+    /*-----------------------------------private-----------------------------------*/
+
     /**
      * 制度优化
      *
@@ -555,39 +587,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         }
     }
 
-
-    /**
-     * 间开优化历史--分页列表
-     *
-     * @param context 上下文
-     * @param input   输入
-     * @return {@link XPageResult}<{@link QueryOptimizeHistoryViewOutput}>
-     */
-    @XApiAnonymous
-    @XApiGet
-    @XText("间开优化历史--分页列表")
-    public XPageResult<QueryOptimizeHistoryViewOutput> queryOptimizeHistoryView(XContext context, QueryOptimizeHistoryViewInput input) {
-        SpaceInstitutionDetailViewMapper mapper = context.getBean(SpaceInstitutionDetailViewMapper.class);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<SpaceInstitutionDetailView> historyList = mapper.selectOptimizeHistoryList(SpaceInstitutionDetailView.builder()
-                .ouId(input.getOuId())
-                .build()
-        );
-        PageInfo<SpaceInstitutionDetailView> pageInfo = new PageInfo<>(historyList);
-        List<QueryOptimizeHistoryViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryOptimizeHistoryViewOutput.class);
-        if (CollUtil.isNotEmpty(outputs)) {
-            Map<String, String> lineNameMap = ServiceUtil.getPowerLineNameMap(context, outputs.stream()
-                    .map(QueryOptimizeHistoryViewOutput::getLineId)
-                    .distinct()
-                    .collect(Collectors.toList())
-            );
-            outputs.forEach(o -> o.setLineName(lineNameMap.get(o.getLineId())));
-        }
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-    /*-----------------------------------private-----------------------------------*/
-
     /**
      * 条件查询输电线路井口列表
      *

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceInstitutionDetailViewMapper.xml

@@ -83,6 +83,7 @@
                                            start_interval
                                     FROM space_institution_detail
                                     WHERE is_current_basic = 0
+                                      AND is_deleted = 1
                                       AND ou_id = #{ouId}),
              long_period
                  AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number,id,
@@ -91,7 +92,8 @@
                             optimize_state,
                             optimize_deadline
                      FROM space_optimize_long_period
-                     WHERE institution_id IN (SELECT id FROM institution_detail)),
+                     WHERE institution_id IN (SELECT id FROM institution_detail)
+                       AND is_deleted = 1),
              mid_period
                  AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number,id,
                             institution_id,
@@ -99,7 +101,8 @@
                             optimize_state,
                             optimize_deadline
                      FROM space_optimize_mid_period
-                     WHERE institution_id IN (SELECT id FROM institution_detail))
+                     WHERE institution_id IN (SELECT id FROM institution_detail)
+                       AND is_deleted = 1)
         SELECT d.id,
                d.ou_id,
                d.line_id,