代码调整

2022-11-08 09:48:02 +08:00
parent 7b0c2435fc
commit 3abd49707f
290 changed files with 13772 additions and 1639 deletions
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java
@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
@@ -43,16 +44,38 @@ public class PmsGeneratrixController extends BaseController {
    /**
     * 获取指定母线信息
     *
-     * @param pmsGeneratrixParam 获取指定的监测点信息条件
+     * @param param 获取指定的监测点信息条件
     * @return 指定母线信息
     */
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/getGeneratrixInfo")
    @ApiOperation("获取指定母线信息")
-    @ApiImplicitParam(name = "pmsGeneratrixParam", value = "获取指定母线信息条件", required = true)
-    public HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody @Validated PmsGeneratrixParam pmsGeneratrixParam) {
+    @ApiImplicitParam(name = "param", value = "获取指定母线信息条件", required = true)
+    public HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody @Validated PmsGeneratrixParam param) {
        String methodDescribe = getMethodDescribe("getGeneratrixInfo");
-        List<PmsGeneratrixDTO> monitorInfo = pmsGeneratrixService.getGeneratrixInfo(pmsGeneratrixParam);
+        List<PmsGeneratrixDTO> monitorInfo = pmsGeneratrixService.getGeneratrixInfo(param);
+        if (CollectionUtil.isEmpty(monitorInfo)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
+        }
+    }
+
+    /**
+     * 获取母线与电站关联信息
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>>
+     * @author yzh
+     * @date 2022/11/3
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGeneratrixAndPowerStationInfo")
+    @ApiOperation("获取母线与电站关联信息")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(@RequestBody @Validated PmsGeneratrixParam param) {
+        String methodDescribe = getMethodDescribe("getGeneratrixAndPowerStationInfo");
+        List<GeneratrixAndPowerStationDTO> monitorInfo = pmsGeneratrixService.getGeneratrixAndPowerStationInfo(param);
        if (CollectionUtil.isEmpty(monitorInfo)) {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
        } else {
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java
@@ -7,7 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
-import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
 import com.njcn.device.pms.service.RStatBusbarHarmonicService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -45,10 +45,10 @@ public class RStatBusbarHarmonicController extends BaseController {
    @PostMapping("/getRStatBusbarHarmonic")
    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
    @ApiOperation("获取变电站母线电压指标年报")
-    @ApiImplicitParam(name = "param", value = "获取变电站母线电压指标年报前端参数", required = true)
-    public HttpResult<List<RStatBusbarHarmonicVO>> getRStatBusbarHarmonic(@RequestBody UniversalFrontEndParam param) {
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatBusbarHarmonicYVO>> getRStatBusbarHarmonic(@RequestBody UniversalFrontEndParam param) {
        String methodDescribe = getMethodDescribe("getRStatBusbarHarmonic");
-        List<RStatBusbarHarmonicVO> list = statBusbarHarmonicService.getRStatBusbarHarmonic(param);
+        List<RStatBusbarHarmonicYVO> list = statBusbarHarmonicService.getRStatBusbarHarmonic(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java
@@ -98,7 +98,7 @@ public class TerminalController extends BaseController {
    @PostMapping("/updateTerminal")
    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
    @ApiOperation("修改监测终端台账信息")
-    @ApiImplicitParam(name = "UpdateParam", value = "更新实体", required = true)
+    @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true)
    public HttpResult<Object> update(@RequestBody @Validated PmsTerminalParam updateParam){
        String methodDescribe = getMethodDescribe("update");
        boolean result = iTerminalService.update(updateParam);
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pms.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.po.Generatrix;
@@ -23,4 +24,14 @@ public interface PmsGeneratrixMapper extends BaseMapper<Generatrix> {
     * @return 母线信息
     */
    List<PmsGeneratrixDTO> getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam);
+
+    /**
+     * 获取母线与电站关联信息
+     *
+     * @param param 条件参数
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+     * @author yzh
+     * @date 2022/11/3
+     */
+    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param);
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java
@@ -1,8 +1,8 @@
 package com.njcn.device.pms.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.po.PmsMonitorPO;
-import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@@ -16,27 +16,18 @@ import java.util.List;
 */

@Mapper
-public interface RStatBusbarHarmonicMapper extends BaseMapper<RStatBusbarHarmonicVO> {
-
-    /**
-     * 根据部门id查询监测点id
-     *
-     * @param deptIds 部门id
-     * @return 监测点id
-     */
-    List<PmsMonitorPO> getMonitorInfo(@Param("deptIds") List<String> deptIds);
-
+public interface RStatBusbarHarmonicMapper extends BaseMapper<RStatBusbarHarmonicYVO> {

    /**
     * 查询变电站背景谐波年表
     *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param startTime     开始时间
+     * @param endTime       结束时间
     * @param generatrixIds 母线id
     * @return 获取变电站母线电压指标年报
     */
-    List<RStatBusbarHarmonicVO> getAnnualReportOfSubstationBusVoltageIndex(@Param("startTime") String startTime,
-                                                                           @Param("endTime") String endTime,
-                                                                           @Param("busbarIds") List<String> generatrixIds);
+    List<RStatBusbarHarmonicYPO> getRStatBusbarHarmonic(@Param("startTime") String startTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("generatrixIds") List<String> generatrixIds);

 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml
@@ -5,31 +5,82 @@
    <!--获取母线信息-->
    <select id="getGeneratrixInfo" resultType="com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO">
        SELECT
-        Org_Id AS orgId,
-        Org_Name AS orgName,
-        Powerr_Id AS powerId,
-        Powerr_Name AS powerName,
-        Generatrix_Id AS generatrixId,
-        Generatrix_Name AS generatrixName,
-        Id AS monitorId,
-        `Name` AS monitorName,
-        Voltage_Level AS generatrixVoltageLevel
+        pm.Org_Id AS orgId,
+        pm.Org_Name AS orgName,
+        pm.Powerr_Id AS powerId,
+        pm.Powerr_Name AS powerName,
+        pg.Generatrix_Id AS generatrixId,
+        pm.Generatrix_Name AS generatrixName,
+        pm.Id AS monitorId,
+        pm.`Name` AS monitorName,
+        pg.Scale AS generatrixVoltageLevel
        FROM
-        pms_monitor
+        pms_generatrix AS pg
+        LEFT JOIN pms_monitor AS pm ON pm.Generatrix_Id = pg.Generatrix_Id
        WHERE
-        Status = 1
-        AND Generatrix_Id IN
+        pm.`Status` = 1
+        AND pg.`Status` =1
+        AND pg.Generatrix_Id IN
        <foreach collection="pmsGeneratrixParam.generatrixIds" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
        <if test="pmsGeneratrixParam.generatrixVoltageLevel != null and pmsGeneratrixParam.generatrixVoltageLevel.size() != 0">
-            AND Voltage_Level IN
-            <foreach collection="pmsGeneratrixParam.generatrixVoltageLevel" item="item" open="(" close=")" separator=",">
+            AND pg.Scale IN
+            <foreach collection="pmsGeneratrixParam.generatrixVoltageLevel" item="item" open="(" close=")"
+                     separator=",">
                #{item}
            </foreach>
        </if>
        <if test="pmsGeneratrixParam.generatrixName != null and pmsGeneratrixParam.generatrixName != ''">
-            AND Generatrix_Name LIKE CONCAT('%',#{pmsGeneratrixParam.generatrixName},'%')
+            AND pm.Generatrix_Name LIKE CONCAT('%',#{pmsGeneratrixParam.generatrixName},'%')
+        </if>
+    </select>
+
+    <!--获取母线与电站关联信息-->
+    <select id="getGeneratrixAndPowerStationInfo"
+            resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO">
+        SELECT
+        pg.Generatrix_Id AS generatrixId,
+        pg.Generatrix_Name AS generatrixName,
+        pg.Scale AS generatrixVoltageLevel,
+        pss.Power_Id AS powerId,
+        pss.Power_Name AS powerName,
+        pss.Voltage_Level AS powerVoltageLevel
+        FROM
+        pms_generatrix AS pg
+        LEFT JOIN pms_statation_stat AS pss ON pg.Statation_Id = pss.Power_Id
+        WHERE
+        pg.`Status` = 1
+        AND pss.`Status` = 1
+        <if test="param.generatrixIds != null and param.generatrixIds.size() >0 ">
+            AND pg.Generatrix_Id IN
+            <foreach collection="param.generatrixIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.powerStationIds != null and param.powerStationIds.size() >0 ">
+            AND pss.Power_Id IN
+            <foreach collection="param.powerStationIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.generatrixVoltageLevel != null and param.generatrixVoltageLevel.size() >0 ">
+            AND pg.Scale  IN
+            <foreach collection="param.generatrixVoltageLevel" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.powerStationVoltageLevel != null and param.powerStationVoltageLevel.size() >0 ">
+            AND pss.Voltage_Level  IN
+            <foreach collection="param.powerStationVoltageLevel" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.generatrixName != null and param.generatrixName !='' ">
+            AND pg.Generatrix_Name LIKE CONCAT('%',#{param.generatrixName},'%')
+        </if>
+        <if test="param.powerStationName != null and param.powerStationName !='' ">
+            AND pss.Power_Name LIKE CONCAT('%',#{param.powerStationName},'%')
        </if>
    </select>

--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml
@@ -2,44 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.device.pms.mapper.RStatBusbarHarmonicMapper">

-    <!--根据部门id查询监测点id-->
-    <select id="getMonitorInfo" resultType="com.njcn.device.pms.pojo.po.PmsMonitorPO">
-        SELECT
-        id,
-        `Name`,
-        Org_Name AS orgName,
-        Org_Id AS orgId,
-        Operation_Name AS operationName,
-        Operation_Id AS operationId,
-        Powerr_Name AS powerrName,
-        Powerr_Id AS powerrId,
-        Generatrix_Name AS generatrixName,
-        Generatrix_Id AS generatrixId
-        FROM
-        pms_monitor
-        WHERE
-        Org_Id IN ()
-        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-    </select>
-
-
-
    <!--查询变电站背景谐波年表-->
-    <select id="getAnnualReportOfSubstationBusVoltageIndex"
-            resultType="com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO">
+    <select id="getRStatBusbarHarmonic"
+            resultType="com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO">
        SELECT
-        *
+        busbar_id AS busbarId,
+        data_date AS dataDate,
+        v_effective_max AS vEffectiveMax,
+        v_effective_min AS vEffectiveMin,
+        v_effective_avg AS vEffectiveAvg,
+        v_effective_95 AS vEffective95,
+        v_thd_max AS vThdMax,
+        v_thd_min AS vThdMin,
+        v_thd_avg AS vThdAvg,
+        v_thd_95 AS vThd95,
+        unbalance_max AS unbalanceMax,
+        unbalance_min AS unbalanceMin,
+        unbalance_avg AS unbalanceAvg,
+        unbalance_95 AS unbalance95,
+        flicker_max AS flickerMax,
+        flicker_min AS flickerMin,
+        flicker_avg AS flickerAvg,
+        flicker_95 AS flicker95
        FROM
        r_stat_busbar_harmonic_y
        WHERE
-        <if test="busbarIds != null and busbarIds.size() > 0">
-            busbar_id IN
-            <foreach collection="generatrixIds" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
+        busbar_id IN
+        <foreach collection="generatrixIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
        <if test="startTime != null and startTime != ''">
            AND DATE_FORMAT( data_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime},'%Y-%m-%d')
        </if>
@@ -47,4 +38,4 @@
            AND DATE_FORMAT( data_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime},'%Y-%m-%d')
        </if>
    </select>
-</mapper>
+</mapper>
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service;

 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
@@ -19,54 +20,68 @@ public interface IPmsGeneratrixService extends IService<Generatrix> {
    /**
     * 获取母线信息
     *
-     * @param pmsGeneratrixParam 入参
+     * @param param 入参
     * @return 母线信息
     */
-    List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam);
-
+    List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param);

    /**
     * 新增母线
-     * @author cdf
-     * @date 2022/10/25
+     *
     * @param generatrixParam 母线
     * @return boolean
+     * @author cdf
+     * @date 2022/10/25
     */
    boolean addGeneratrix(GeneratrixParam generatrixParam);

    /**
     * 修改母线
-     * @author cdf
-     * @date 2022/10/25
+     *
     * @param generatrixParam 母线
     * @return boolean
+     * @author cdf
+     * @date 2022/10/25
     */
    boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam);

    /**
     * 删除母线
-     * @author cdf
-     * @date 2022/10/25
+     *
     * @param generatrixIds 母线
     * @return boolean
+     * @author cdf
+     * @date 2022/10/25
     */
    boolean delGeneratrix(List<String> generatrixIds);

    /**
     * 查询母线
-     * @author cdf
-     * @date 2022/10/25
+     *
     * @param generatrixId 母线id
     * @return boolean
+     * @author cdf
+     * @date 2022/10/25
     */
    Generatrix getGeneratrixById(String generatrixId);

    /**
     * 查询母线列表
-     * @author cdf
-     * @date 2022/10/25
+     *
     * @param baseParam 基础参数
     * @return boolean
+     * @author cdf
+     * @date 2022/10/25
     */
    List<Generatrix> getGeneratrixList(BaseParam baseParam);
+
+    /**
+     * 获取母线与电站关联信息
+     *
+     * @param param 条件参数
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
+     * @author yzh
+     * @date 2022/11/3
+     */
+    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param);
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java
@@ -3,7 +3,7 @@ package com.njcn.device.pms.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
-import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;

 import java.util.List;

@@ -14,7 +14,7 @@ import java.util.List;
 * @date 2022/10/8
 */

-public interface RStatBusbarHarmonicService extends IService<RStatBusbarHarmonicVO> {
+public interface RStatBusbarHarmonicService extends IService<RStatBusbarHarmonicYVO> {

    /**
     * 获取变电站母线电压指标年报
@@ -22,6 +22,6 @@ public interface RStatBusbarHarmonicService extends IService<RStatBusbarHarmonic
     * @param param 前端参数
     * @return 变电站母线电压指标年报返回前端实体类
     */
-    List<RStatBusbarHarmonicVO> getRStatBusbarHarmonic(UniversalFrontEndParam param);
+    List<RStatBusbarHarmonicYVO> getRStatBusbarHarmonic(UniversalFrontEndParam param);

 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java
@@ -1,7 +1,9 @@
 package com.njcn.device.pms.service.impl;

+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.device.pms.mapper.PmsGeneratrixMapper;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
@@ -27,31 +29,31 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G

    private final PmsGeneratrixMapper pmsGeneratrixMapper;

-
    /**
     * 获取母线信息
     *
-     * @param pmsGeneratrixParam 入参
+     * @param param 入参
     * @return 母线信息
     */
    @Override
-    public List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam) {
-        return pmsGeneratrixMapper.getGeneratrixInfo(pmsGeneratrixParam);
+    public List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param) {
+        if (CollUtil.isEmpty(param.getGeneratrixIds())) {
+            return null;
+        }
+        return pmsGeneratrixMapper.getGeneratrixInfo(param);
    }

-
-
    @Override
    public boolean addGeneratrix(GeneratrixParam generatrixParam) {
        Generatrix generatrix = new Generatrix();
-        BeanUtils.copyProperties(generatrixParam,generatrix);
+        BeanUtils.copyProperties(generatrixParam, generatrix);
        return this.save(generatrix);
    }

    @Override
    public boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam) {
        Generatrix generatrix = new Generatrix();
-        BeanUtils.copyProperties(generatrixParam,generatrix);
+        BeanUtils.copyProperties(generatrixParam, generatrix);
        return this.save(generatrix);
    }

@@ -69,4 +71,17 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
    public List<Generatrix> getGeneratrixList(BaseParam baseParam) {
        return this.list();
    }
+
+    /**
+     * 获取母线与电站关联信息
+     *
+     * @param param 条件参数
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
+     * @author yzh
+     * @date 2022/11/3
+     */
+    @Override
+    public List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) {
+        return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param);
+    }
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java
@@ -1,24 +1,28 @@
 package com.njcn.device.pms.service.impl;

-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.PmsGeneratrixClient;
 import com.njcn.device.pms.mapper.RStatBusbarHarmonicMapper;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
-import com.njcn.device.pms.pojo.po.PmsMonitorPO;
-import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
 import com.njcn.device.pms.service.RStatBusbarHarmonicService;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.dto.DeptDTO;
-import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;

 /**
@@ -31,14 +35,13 @@ import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@Slf4j
-public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmonicMapper, RStatBusbarHarmonicVO> implements RStatBusbarHarmonicService {
+public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmonicMapper, RStatBusbarHarmonicYVO> implements RStatBusbarHarmonicService {

    private final RStatBusbarHarmonicMapper rStatBusbarHarmonicMapper;

-    private final DicDataFeignClient dicDataFeignClient;
-
-    private final DeptFeignClient deptFeignClient;
+    private final PmsGeneratrixClient pmsGeneratrixClient;

+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;

    /**
     * 获取变电站母线电压指标年报
@@ -47,76 +50,69 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
     * @return 变电站母线电压指标年报返回前端实体类
     */
    @Override
-    public List<RStatBusbarHarmonicVO> getRStatBusbarHarmonic(UniversalFrontEndParam param) {
-
-        // 获取登录用户的部门id
-//        String deptIndex = RequestUtil.getDeptIndex();
-
+    public List<RStatBusbarHarmonicYVO> getRStatBusbarHarmonic(UniversalFrontEndParam param) {
        // 获取当前用户的部门的子部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam();
+        pmsDeviceInfoParam.setDeptIndex(param.getId());
+        pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
+        if (CollUtil.isEmpty(data)) {
+            return Collections.emptyList();
+        }

-        if (CollectionUtil.isNotEmpty(data)) {
-            // 创建集合用于封装数据
-            List<RStatBusbarHarmonicVO> info = new ArrayList<>();
-
-            // 过滤出部门id
-            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
-            // 根据部门id 获取监测点信息
-            List<PmsMonitorPO> monitorInfo = rStatBusbarHarmonicMapper.getMonitorInfo(deptIds);
-            // 取出母线id
-            List<String> generatrixIds = monitorInfo.stream().map(PmsMonitorPO::getGeneratrixId).collect(Collectors.toList());
-
-            // 获取电压字典
-            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        // 创建集合封装返回数据
+        List<RStatBusbarHarmonicYVO> result = new ArrayList<>();

+        for (PmsGeneralDeviceDTO dto : data) {
+            if (CollUtil.isEmpty(dto.getGeneratrixIdList())) {
+                continue;
+            }
            // 通过母线id查询变电站背景谐波年表
-            info = rStatBusbarHarmonicMapper.getAnnualReportOfSubstationBusVoltageIndex(param.getStartTime(), param.getEndTime(), generatrixIds);
+            List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());

-            // 属性赋值
-            for (RStatBusbarHarmonicVO vo : info) {
-                for (PmsMonitorPO pmsMonitor : monitorInfo) {
-                    if (vo.getBusbarId().equals(pmsMonitor.getGeneratrixId())){
-                        vo.setDeptId(pmsMonitor.getOrgId());
-                    }
+            for (RStatBusbarHarmonicYPO po : info) {
+                RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
+                vo.setDeptId(dto.getIndex());
+                vo.setDeptName(dto.getName());
+                vo.setBusbarId(po.getBusbarId());
+                vo.setDataDate(po.getDataDate());
+                vo.setVEffectiveMax(po.getVEffectiveMax());
+                vo.setVEffectiveMin(po.getVEffectiveMin());
+                vo.setVEffectiveAvg(po.getVEffectiveAvg());
+                vo.setVEffective95(po.getVEffective95());
+                vo.setVThdMax(po.getVThdMax());
+                vo.setVThdMin(po.getVThdMin());
+                vo.setVThdAvg(po.getVThdAvg());
+                vo.setVThd95(po.getVThd95());
+                vo.setUnbalanceMax(po.getUnbalanceMax());
+                vo.setUnbalanceMin(po.getUnbalanceMin());
+                vo.setUnbalanceAvg(po.getUnbalanceAvg());
+                vo.setUnbalance95(po.getUnbalance95());
+                vo.setFlickerMax(po.getFlickerMax());
+                vo.setFlickerMin(po.getFlickerMin());
+                vo.setFlickerAvg(po.getFlickerAvg());
+                vo.setFlicker95(po.getFlicker95());
+                result.add(vo);
+            }
+        }
+        // 取出母线id
+        List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
+        PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
+        pmsGeneratrixParam.setGeneratrixIds(busbarIds);
+        List<GeneratrixAndPowerStationDTO> dtoS = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam).getData();
+
+        for (GeneratrixAndPowerStationDTO dto : dtoS) {
+            for (RStatBusbarHarmonicYVO vo : result) {
+                if (dto.getGeneratrixId().equals(vo.getBusbarId())){
+                    vo.setBusbarName(dto.getGeneratrixName());
+                    vo.setSubId(dto.getPowerId());
+                    vo.setSubName(dto.getPowerName());
+                    vo.setSubVoltageLevel(dto.getPowerVoltageLevel());
                }
            }
-
-            return info;
-        } else {
-            return new ArrayList<>();
        }
+
+        return result;
    }

-    /**
-     * 属性赋值
-     *
-     * @param data                                    当前用户的部门的子部门信息
-     * @param annualReportOfSubstationBusVoltageIndex 母线id查询变电站背景谐波年表
-     * @param subAndVoltageInfos                      母线和变电站信息
-     * @return 返回前端集合
-     */
-    private void attributeCopy(List<DeptDTO> data, List<RStatBusbarHarmonicVO> annualReportOfSubstationBusVoltageIndex, List<RStatBusbarHarmonicVO> subAndVoltageInfos) {
-        // 属性赋值
-        for (RStatBusbarHarmonicVO vo : annualReportOfSubstationBusVoltageIndex) {
-            for (RStatBusbarHarmonicVO subAndVoltageInfo : subAndVoltageInfos) {
-                if (subAndVoltageInfo.getBusbarId().equals(vo.getBusbarId())) {
-                    vo.setDeptId(subAndVoltageInfo.getDeptId());
-                    vo.setSubName(subAndVoltageInfo.getSubName());
-                    vo.setSubVoltageLevel(subAndVoltageInfo.getSubVoltageLevel());
-                    vo.setBusbarName(subAndVoltageInfo.getBusbarName());
-                }
-            }
-        }
-
-        // 属性赋值
-        for (RStatBusbarHarmonicVO vo : annualReportOfSubstationBusVoltageIndex) {
-            for (DeptDTO datum : data) {
-                if (datum.getId().equals(vo.getDeptId())) {
-                    vo.setCompany(datum.getName());
-                }
-            }
-        }
-    }
-
-}
+}