feat(吉林演示): 松原

1.基础信息配置模块创建基础风机电站表及基础风机电站关联测风塔表,同时生成对应代码;
2.开发基础信息配置模块基础风机电站新增接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
3.开发基础信息配置模块基础风机电站详情接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
4.开发基础信息配置模块基础风机电站修改接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
5.开发基础信息配置模块基础风机电站删除接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
6.开发基础信息配置模块基础风机电站分页查询接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
7.开发基础信息配置模块基础风机电站组织和风力发电机树接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

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

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

@@ -69,6 +69,14 @@ public interface SysOrganizationViewMapper {
      */
     List<SysOrganizationView> selectLineList(SysOrganizationView record);
 
+    /**
+     * 查询登录人组织下风机电站列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SysOrganizationView }>
+     */
+    List<SysOrganizationView> selectWindTurbineList(SysOrganizationView record);
+
     /**
      * 查询组织和线路列表
      *
@@ -77,6 +85,14 @@ public interface SysOrganizationViewMapper {
      */
     List<SysOrganizationView> selectOrgAndLineList(SysOrganizationView record);
 
+    /**
+     * 查询组织和风电站列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SysOrganizationView }>
+     */
+    List<SysOrganizationView> selectOrgAndWindStationList(SysOrganizationView record);
+
     /**
      * 查询子线路列表
      *
@@ -93,5 +109,13 @@ public interface SysOrganizationViewMapper {
      */
     List<SysOrganizationView> selectOrgList(SysOrganizationView record);
 
+    /**
+     * 查询组织和风电站列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SysOrganizationView }>
+     */
+    List<SysOrganizationView> selectOrgAndWindTurbineList(SysOrganizationView record);
+
     SysOrganizationView selectOrgProvince(SysOrganizationView record);
 }

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java

@@ -464,6 +464,36 @@ public class SysOrganizationService {
         return XListResult.success(XCopyUtils.copyNewList(viewList, DynamicQuerySysOrganizationOutput.class));
     }
 
+
+    /**
+     * 查询组织和风力发电机列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult }<{@link QueryOrgWindTurbineOutput }>
+     */
+    @XText("组织机构管理--查询组织和风电站列表")
+    @XApiPost
+    public XListResult<QueryOrgWindTurbineOutput> queryOrgAndWindTurbineList(XContext context, DynamicQuerySysOrganizationInput input) {
+        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
+        SysOrganizationView view = new SysOrganizationView();
+        List<SysOrganizationView> viewList;
+        //单独查组织
+        if (CharSequenceUtil.isAllBlank(input.getId(), input.getOuName())) {
+            //如果条件都为空,则从登录信息获取条件
+            PpsUserSession session = context.getSession(PpsUserSession.class);
+            view.setId(session.getOuId());
+            viewList = mapper.selectOrgAndWindTurbineList(view);
+        } else if (CharSequenceUtil.isNotBlank(input.getOuName())) {
+            view.setOuName(input.getOuName());
+            viewList = mapper.selectWindTurbineList(view);
+        } else {
+            view.setId(input.getId());
+            viewList = mapper.selectOrgAndWindStationList(view);
+        }
+        return XListResult.success(XCopyUtils.copyNewList(viewList, QueryOrgWindTurbineOutput.class));
+    }
+
     @XText("根据父级id查询儿子级-特殊")
     @XApiPost
     public XListResult<GetSysOrganizationViewOutput> selectSpecailOuInfoByParentOuId(XContext context, GetSysOrganizationRelInput input) {

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

+package pps.core.system.service.data.sys_organization;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 组织机构和风电电站
+ *
+ * @author ZWT
+ * @date 2024/08/28 23:31
+ */
+@Data
+public class QueryOrgWindTurbineOutput {
+
+    @XText("主键")
+    private String id;
+
+    @XText("组织机构名称")
+    private String ouName;
+
+    @XText("类型(ORG_组织;STATION_电站)")
+    private String ouLevel;
+
+    @XText("电站ID")
+    private String stationId;
+}

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

@@ -568,6 +568,7 @@
 
     <resultMap id="ExtendResultMap" type="pps.core.system.entity.SysOrganizationView" extends="BaseResultMap">
         <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
+        <result column="station_id" property="stationId" jdbcType="VARCHAR"/>
         <result column="grid_type_key" property="gridTypeKey" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -589,6 +590,24 @@
         ORDER BY line_name DESC
     </select>
 
+    <select id="selectWindTurbineList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        SELECT ou_id AS id,
+        station_name AS ou_name,
+        id AS station_id,
+        'STATION' AS ou_level
+        FROM base_wind_turbine
+        <where>
+            <if test="id != null and id != ''">
+                AND ou_id = #{id}
+            </if>
+            <if test="ouName != null and ouName != ''">
+                AND station_name LIKE CONCAT('%', #{ouName}, '%')
+            </if>
+        </where>
+        ORDER BY station_name DESC
+    </select>
+
     <select id="selectOrgAndLineList" parameterType="pps.core.system.entity.SysOrganizationView"
             resultMap="ExtendResultMap">
         (SELECT ROW_NUMBER() OVER ( ORDER BY r.sort ) AS rn, o.id,
@@ -627,6 +646,29 @@
          ORDER BY line_name)
     </select>
 
+    <select id="selectOrgAndWindStationList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        (SELECT ROW_NUMBER() OVER ( ORDER BY r.sort ) AS rn, o.id,
+                o.ou_name AS ou_name,
+                ''        AS station_id,
+                'ORG'     AS ou_level
+         FROM sys_organization o
+                  LEFT JOIN sys_organization_rel r ON o.id = r.ou_id
+         WHERE r.parent_ou_id = #{id}
+           AND r.end_time >= NOW()
+           AND o.is_deleted = 1
+         ORDER BY r.sort)
+        UNION ALL
+        (SELECT ROW_NUMBER()    OVER ( ORDER BY create_time ) AS rn, id AS id,
+                station_name AS ou_name,
+                id           AS station_id,
+                'STATION'    AS ou_level
+         FROM base_wind_turbine
+         WHERE ou_id = #{id}
+           AND is_deleted = 1
+         ORDER BY station_name)
+    </select>
+
     <select id="selectChildLineList" parameterType="pps.core.system.entity.SysOrganizationView"
             resultMap="ExtendResultMap">
         SELECT id        AS id,
@@ -663,4 +705,20 @@
           AND o.is_deleted = 1
         ORDER BY r.sort
     </select>
+
+
+    <select id="selectOrgAndWindTurbineList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        SELECT ROW_NUMBER() OVER ( ORDER BY r.sort ) AS rn, o.id,
+               o.ou_name AS ou_name,
+               ''        AS station_id,
+               'STATION' AS ou_level,
+               ''        AS grid_type_key
+        FROM sys_organization o
+                 LEFT JOIN sys_organization_rel r ON o.id = r.ou_id
+        WHERE o.id = #{id}
+          AND r.end_time >= NOW()
+          AND o.is_deleted = 1
+        ORDER BY r.sort
+    </select>
 </mapper>