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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/entity/SysOrganizationView.java

@@ -155,4 +155,11 @@ public class SysOrganizationView implements Serializable {
     @XText("线路ID")
     @TableField(exist = false)
     private String lineId;
+
+    /**
+     * 电网类型key
+     */
+    @XText("电网类型key(字典获取)")
+    @TableField(exist = false)
+    private String gridTypeKey;
 }

C02-system/pps-core-system/src/main/java/pps/core/system/service/data/sys_organization/DynamicQuerySysOrganizationOutput.java

@@ -23,4 +23,10 @@ public class DynamicQuerySysOrganizationOutput {
 
     @XText("线路ID")
     private String lineId;
+
+    /**
+     * 电网类型key
+     */
+    @XText("电网类型key(字典获取)")
+    private String gridTypeKey;
 }

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

@@ -558,6 +558,7 @@
 
     <resultMap id="ExtendResultMap" type="pps.core.system.entity.SysOrganizationView" extends="BaseResultMap">
         <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
+        <result column="grid_type_key" property="gridTypeKey" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="selectLineList" parameterType="pps.core.system.entity.SysOrganizationView"
@@ -577,7 +578,8 @@
         (SELECT o.id,
                 o.ou_name AS ou_name,
                 ''        AS line_id,
-                'ORG'     AS ou_level
+                'ORG'     AS ou_level,
+                ''        AS grid_type_key
          FROM sys_organization o
                   LEFT JOIN sys_organization_rel r ON o.id = r.ou_id
          WHERE r.parent_ou_id = #{id}
@@ -585,7 +587,11 @@
            AND o.is_deleted = 1
          ORDER BY r.sort)
         UNION ALL
-        (SELECT ou_id AS id, line_name AS ou_name, id AS line_id, 'LINE' AS ou_level
+        (SELECT ou_id     AS id,
+                line_name AS ou_name,
+                id        AS line_id,
+                'LINE'    AS ou_level,
+                grid_type_key
          FROM base_power_line
          WHERE ou_id = #{id}
            AND is_deleted = 1