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

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
6.修改基础信息配置--间开制度管理模块,设为基础制度/重新优化接口,增加业务逻辑初始化校准周期;
7.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化时间超过一天问题;
8.修改系统管理Cloud模块,查询子集组织列表接口,增加查询逻辑,解决查询出重复数据问题;
9.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化跨月导致数据异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/mapper/SysAreaViewMapper.java

 package pps.core.system.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.system.entity.SysAreaView;
+
 import java.util.List;
 
-@Repository(value="pps.core.system.mapper.SysAreaViewMapper")
+@Repository(value = "pps.core.system.mapper.SysAreaViewMapper")
 public interface SysAreaViewMapper {
     SysAreaView selectOne(SysAreaView record);
+
     List<SysAreaView> selectList(SysAreaView record);
+
     List<SysAreaView> selectListAll(SysAreaView record);
+
+    /**
+     * 查询地区列表
+     *
+     * @return {@link List}<{@link SysAreaView}>
+     */
+    List<SysAreaView> selectListAllNew();
 }

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysAreaViewMapper.xml

@@ -2,27 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pps.core.system.mapper.SysAreaViewMapper">
     <resultMap id="BaseResultMap" type="pps.core.system.entity.SysAreaView">
-    <result column="id" property="id" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
-    <result column="lev" property="lev" jdbcType="INTEGER" />
+        <result column="id" property="id" jdbcType="INTEGER"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
+        <result column="lev" property="lev" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
-    id,
+        id
+        ,
     name,
     parent_id,
     lev
     </sql>
     <select id="selectOne" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from sys_area
         where
         id=#{id}
     </select>
     <select id="selectList" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from sys_area
         where
         id=#{id}
@@ -30,8 +31,37 @@
 
     <select id="selectListAll" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from sys_area
+        WHERE
+        id &lt;&gt; 120
+        ORDER BY
+        parent_id,
+        id
+    </select>
 
+    <select id="selectListAllNew" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
+        WITH RECURSIVE area_tree (n, id, parent_id) AS (SELECT 0 AS n,
+                                                               id,
+                                                               parent_id
+                                                        FROM sys_area
+                                                        WHERE parent_id = 20
+                                                        UNION ALL
+                                                        SELECT n + 1,
+                                                               a.id,
+                                                               a.parent_id
+                                                        FROM area_tree AS t
+                                                                 JOIN sys_area AS a ON a.parent_id = t.id)
+        SELECT t.id,
+               t.parent_id,
+               t.n AS lev,
+               a.NAME,
+               a.city_code,
+               a.province_code
+        FROM area_tree t,
+             sys_area a
+        WHERE t.id = a.id
+        ORDER BY t.parent_id,
+                 t.id
     </select>
 </mapper>