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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;
2.修改基础信息配置--基础间开配置模块,设为基础制度接口,添加限制条件,不能优化结束日期在当天之前的数据;
3.修改间开制度管理--长期/中短期间开优化功能,添加通过线路ID查询线路下储能设备列表接口,修改离网型制度优化逻辑;
4.修改基础信息配置--基础间开配置模块设为基础间开/重新校准接口,修改离网型制度优化逻辑;
5.修改间开制度管理--长期/中短期/短期间开优化功能,相关井口记录表新增启动顺序字段,修改优化功能代码逻辑,添加启动顺序,相关详情接口增加按照启动顺序排序功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongWellheadEnt.java

@@ -29,4 +29,8 @@ public class SpaceOptimizeLongWellheadEnt extends BaseModel implements Serializa
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongWellheadView.java

@@ -27,4 +27,8 @@ public class SpaceOptimizeLongWellheadView extends BaseModel implements Serializ
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidWellheadEnt.java

@@ -29,4 +29,8 @@ public class SpaceOptimizeMidWellheadEnt extends BaseModel implements Serializab
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidWellheadView.java

@@ -27,4 +27,8 @@ public class SpaceOptimizeMidWellheadView extends BaseModel implements Serializa
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortWellheadEnt.java

@@ -29,4 +29,8 @@ public class SpaceOptimizeShortWellheadEnt extends BaseModel implements Serializ
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortWellheadView.java

@@ -33,4 +33,8 @@ public class SpaceOptimizeShortWellheadView extends BaseModel implements Seriali
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeWellheadDTO.java

@@ -27,4 +27,8 @@ public class SpaceOptimizeWellheadDTO extends BaseModel implements Serializable
     @XText("井号")
     @TableField
     private String wellNumber;
+
+    @XText("启动顺序")
+    @TableField
+    private Integer startSeq;
 }

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

@@ -249,7 +249,7 @@ public class SpaceOptimizeBaseService {
         for (int w = 0, wellheadSize = wellheadViewList.size(); w < wellheadSize; w++) {
             SpaceInstitutionWellheadView wellhead = wellheadViewList.get(w);
             String wellheadId = wellhead.getWellheadId();
-            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
             //取当前井口最大发电量
             BigDecimal serviceRating = wellhead.getServiceRating();
             List<SpaceInstitutionDurationEnt> durationConfigList = durationMap.get(wellheadId);
@@ -485,15 +485,17 @@ public class SpaceOptimizeBaseService {
      * @param periodId        期间id
      * @param wellheadId      井口id
      * @param wellNumber      井号
+     * @param startSeq        开始seq
      * @return {@link String}
      */
     public String createOptimizeWellhead(List<SpaceOptimizeWellheadDTO> wellheadDTOList, String periodId,
-                                         String wellheadId, String wellNumber) {
+                                         String wellheadId, String wellNumber, Integer startSeq) {
         SpaceOptimizeWellheadDTO wellheadDTO = new SpaceOptimizeWellheadDTO();
         BaseUtils.setBaseModelDefaultForJob(wellheadDTO);
         wellheadDTO.setPeriodId(periodId);
         wellheadDTO.setWellheadId(wellheadId);
         wellheadDTO.setWellNumber(wellNumber);
+        wellheadDTO.setStartSeq(startSeq);
         wellheadDTOList.add(wellheadDTO);
         return wellheadDTO.getId();
     }
@@ -590,7 +592,7 @@ public class SpaceOptimizeBaseService {
         for (int w = 0, wellheadSize = wellheadViewList.size(); w < wellheadSize; w++) {
             SpaceInstitutionWellheadView wellhead = wellheadViewList.get(w);
             String wellheadId = wellhead.getWellheadId();
-            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
             //取当前井口最大发电量
             BigDecimal serviceRating = wellhead.getServiceRating();
             List<SpaceInstitutionDurationEnt> durationConfigList = durationMap.get(wellheadId);
@@ -737,7 +739,7 @@ public class SpaceOptimizeBaseService {
         for (int w = 0, wellheadSize = wellheadViewList.size(); w < wellheadSize; w++) {
             SpaceInstitutionWellheadView wellhead = wellheadViewList.get(w);
             String wellheadId = wellhead.getWellheadId();
-            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+            String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
             List<SpaceInstitutionDurationEnt> durationConfigList = durationMap.get(wellheadId);
             if (CollUtil.isEmpty(durationConfigList)) {
                 //没有设置时间段,无法优化
@@ -816,7 +818,7 @@ public class SpaceOptimizeBaseService {
         if (CollUtil.isNotEmpty(unOptimizeWellheadList)) {
             for (SpaceInstitutionWellheadView wellhead : unOptimizeWellheadList) {
                 String wellheadId = wellhead.getWellheadId();
-                String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+                String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
                 switch (wellhead.getIntervalTypeKey()) {
                     //小间开(不优化)
                     case "0":

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

@@ -119,6 +119,7 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
         List<SpaceOptimizeLongWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongWellheadEnt>()
                 .eq(SpaceOptimizeLongWellheadEnt::getLongPeriodId, longPeriodId)
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .orderByAsc(SpaceOptimizeLongWellheadEnt::getStartSeq)
         );
         if (CollUtil.isNotEmpty(wellheadList)) {
             List<GetSpaceOptimizeLongWellheadOutput> wellheadOutputs = XCopyUtils.copyNewList(wellheadList, GetSpaceOptimizeLongWellheadOutput.class);

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

@@ -117,6 +117,7 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
         List<SpaceOptimizeMidWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeMidWellheadEnt>()
                 .eq(SpaceOptimizeMidWellheadEnt::getMidPeriodId, midPeriodId)
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .orderByAsc(SpaceOptimizeMidWellheadEnt::getStartSeq)
         );
         if (CollUtil.isNotEmpty(wellheadList)) {
             List<GetSpaceOptimizeMidWellheadOutput> wellheadOutputs = XCopyUtils.copyNewList(wellheadList, GetSpaceOptimizeMidWellheadOutput.class);

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

@@ -107,7 +107,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
             if (CollUtil.isNotEmpty(unOptimizeWellheadList)) {
                 for (SpaceInstitutionWellheadEnt wellhead : unOptimizeWellheadList) {
                     String wellheadId = wellhead.getWellheadId();
-                    String recordId = super.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+                    String recordId = super.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
                     switch (wellhead.getIntervalTypeKey()) {
                         //小间开(不优化)
                         case "0":
@@ -166,7 +166,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
                 }
                 for (SpaceInstitutionWellheadEnt wellhead : needToOptimizeWellheadList) {
                     String wellheadId = wellhead.getWellheadId();
-                    String recordId = super.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber());
+                    String recordId = super.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq());
                     if (!durationListMap.containsKey(wellheadId)) {
                         continue;
                     }

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

@@ -13,6 +13,7 @@
         <result column="long_period_id" property="longPeriodId" jdbcType="VARCHAR"/>
         <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
         <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="start_seq" property="startSeq" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -26,7 +27,8 @@
     modify_time,
     long_period_id,
     wellhead_id,
-    well_number
+    well_number,
+    start_seq
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeLongWellheadView"
             resultMap="BaseResultMap">

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pps.core.space.mapper.SpaceOptimizeMidWellheadViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.space.entity.SpaceOptimizeMidWellheadView">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
+        <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
+        <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="DATE"/>
+        <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
+        <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
+        <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
+        <result column="mid_period_id" property="midPeriodId" jdbcType="VARCHAR"/>
+        <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
+        <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="start_seq" property="startSeq" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        ,
+    is_deleted,
+    create_by_id,
+    create_by_name,
+    create_time,
+    modify_by_id,
+    modify_by_name,
+    modify_time,
+    mid_period_id,
+    wellhead_id,
+    well_number,
+    start_seq
+    </sql>
+    <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeMidWellheadView" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from space_optimize_mid_wellhead
+        where
+        id=#{id}
+    </select>
+    <select id="selectList" parameterType="pps.core.space.entity.SpaceOptimizeMidWellheadView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from space_optimize_mid_wellhead
+        where
+        id=#{id}
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -13,6 +13,7 @@
         <result column="short_period_id" property="shortPeriodId" jdbcType="VARCHAR"/>
         <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
         <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="start_seq" property="startSeq" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -26,7 +27,8 @@
     modify_time,
     short_period_id,
     wellhead_id,
-    well_number
+    well_number,
+    start_seq
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeShortWellheadView"
             resultMap="BaseResultMap">

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

@@ -27,7 +27,7 @@
 
     <insert id="longWellheadBatchInsertList" parameterType="list">
         INSERT INTO space_optimize_long_wellhead ( id, create_by_id, create_by_name, create_time,
-        modify_by_id, modify_by_name, modify_time, long_period_id, wellhead_id, well_number )
+        modify_by_id, modify_by_name, modify_time, long_period_id, wellhead_id, well_number, start_seq)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -40,7 +40,8 @@
             #{item.modifyTime},
             #{item.periodId},
             #{item.wellheadId},
-            #{item.wellNumber}
+            #{item.wellNumber},
+            #{item.start_seq}
             )
         </foreach>
     </insert>
@@ -115,7 +116,7 @@
 
     <insert id="midWellheadBatchInsertList" parameterType="list">
         INSERT INTO space_optimize_mid_wellhead ( id, create_by_id, create_by_name, create_time,
-        modify_by_id, modify_by_name, modify_time, mid_period_id, wellhead_id, well_number )
+        modify_by_id, modify_by_name, modify_time, mid_period_id, wellhead_id, well_number, start_seq)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -128,7 +129,8 @@
             #{item.modifyTime},
             #{item.periodId},
             #{item.wellheadId},
-            #{item.wellNumber}
+            #{item.wellNumber},
+            #{item.start_seq}
             )
         </foreach>
     </insert>
@@ -201,7 +203,7 @@
 
     <insert id="shortWellheadBatchInsertList" parameterType="list">
         INSERT INTO space_optimize_short_wellhead (id, create_by_id, create_by_name, create_time, modify_by_id,
-        modify_by_name, modify_time, short_period_id, wellhead_id, well_number)
+        modify_by_name, modify_time, short_period_id, wellhead_id, well_number, start_seq)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -214,7 +216,8 @@
             #{item.modifyTime},
             #{item.periodId},
             #{item.wellheadId},
-            #{item.wellNumber}
+            #{item.wellNumber},
+            #{item.start_seq}
             )
         </foreach>
     </insert>