合并代码提交

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java

@@ -4,6 +4,7 @@ package com.njcn.harmonic.controller.distribution;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.harmonic.pojo.param.RStatOrgParam;
@@ -35,12 +36,7 @@ import java.util.List;
 public class PwRStatOrgController extends BaseController {
 
     private final PwRStatOrgService pwRStatOrgService;
-    private final RStatOrgYService rStatOrgYService;
-    private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService;
-    private final RStatLoadTypeService rStatLoadTypeService;
-    private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService;
     private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService;
-    private final RMpPassRateService rMpPassRateService;
 
 
     /**
@@ -56,118 +52,75 @@ public class PwRStatOrgController extends BaseController {
     }
 
 
-//    /**
-//     * 区域稳态指标超标分类统计表
-//     */
-//    @GetMapping("/getPwRStatSubstation")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("区域稳态指标超标分类统计表")
-//    public HttpResult<List<RStatSubstationOrg2VO>> getRStatSubstation(StatisticsBizBaseParam param) {
-//        String methodDescribe = getMethodDescribe("getRStatSubstation");
-//        List<RStatSubstationOrg2VO> statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
-//    }
-//
-//    /**
-//     * 区域稳态指标超标分类统计表
-//     */
-//    @PostMapping("/getRStatOrgBusbarVoltage")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("区域电站母线电压类指标超标计")
-//    public HttpResult<List<RStatOrgBusbarVoltageVO>> getRStatOrgBusbarVoltage(@RequestBody StatSubstationBizBaseParam param) {
-//        String methodDescribe = getMethodDescribe("getRStatOrgBusbarVoltage");
-//        List<RStatOrgBusbarVoltageVO> statSubstationIcon = rStatOrgBusbarVoltageService.getRStatOrgBusbarVoltage(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
-//    }
-//
-//    /**
-//     * 区域干扰源电流类指标超标统计
-//     *
-//     * @param param
-//     * @return
-//     */
-//    @GetMapping("/getRStatLoadType")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("区域干扰源电流类指标超标统计")
-//    public HttpResult<List<RArrayVO>> getRStatLoadType(StatisticsBizBaseParam param) {
-//        String methodDescribe = getMethodDescribe("getRStatLoadType");
-//        List<RArrayVO> rStatLoadType = rStatLoadTypeService.getRStatLoadType(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatLoadType, methodDescribe);
-//    }
-//
-//    /**
-//     * 变电站（换流站）稳态指标超标分类统计表
-//     *
-//     * @param param
-//     * @return
-//     */
-//    @PostMapping("/getRStatSubstationOrg")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("变电站（换流站）稳态指标超标分类统计表")
-//    public HttpResult<List<RSubstationIcon2VO.RSubstationInfoVO>> getRStatSubstationOrg(@RequestBody StatSubstationBizBaseParam param
-//    ) {
-//        String methodDescribe = getMethodDescribe("getRStatSubstationOrg");
-//        List<RSubstationIcon2VO.RSubstationInfoVO> rStatOrg = rStatOrgYService.getRStatSubstation(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
-//    }
-//
-//    /**
-//     * 稳态指标超标明细表
-//     *
-//     * @param param
-//     * @return
-//     */
-//    @PostMapping("/getRMpPartHarmonicDetail")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("稳态指标超标明细表")
-//    public HttpResult<List<RMpPartHarmonicDetailVO>> getRMpPartHarmonicDetail(@RequestBody RStatOrgParam param) {
-//        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetail");
-//        List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailMService.getRMpPartHarmonicDetail(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
-//    }
-//
-//    /**
-//     * 稳态指标超标明细表-指标趋势图
-//     *
-//     * @param param
-//     * @return
-//     */
-//    @GetMapping("/getRMpPartHarmonicDetailIcon")
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @ApiOperation("稳态指标超标明细表-指标趋势图")
-//    public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param) {
-//        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
-//        List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
-//    }
+    /**
+     * 配网区域稳态指标超标分类统计表
+     */
+    @PostMapping("/getPwRStatSubstation")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域稳态指标超标分类统计表")
+    public HttpResult<List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO>> getPwRStatSubstation(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatSubstation");
+        List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> statSubstationIcon = pwRStatOrgService.getRStatSubstationOrg(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
 
     /**
-     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * 配网稳态指标超标明细表
      *
      * @param param
      * @return
      */
-    @GetMapping("/getPwRStatOrgIndex")
+    @PostMapping("/getPwRMpPartHarmonicDetail")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表")
+    public HttpResult<List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO>> getPwRMpPartHarmonicDetail(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwRMpPartHarmonicDetail");
+        List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO> rMpPartHarmonicDetail = pwRStatOrgService.getRMpPartHarmonicDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+
+    /**
+     * 配网稳态指标超标明细表-指标趋势图
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRMpPartHarmonicDetailIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表-指标趋势图")
+    public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
+        List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+
+    /**
+     * 配网区域稳态指标合格率统计表-配网（稳态指标合格率统计）
+     *
+     * @param param、
+     * @return
+     */
+    @PostMapping("/getPwRStatOrgIndex")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("区域稳态指标合格率统计表")
-    public HttpResult<List<PwRStatOrgVO>>getRStatOrgIndex(StatSubstationBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getRStatOrgIndex");
+    public HttpResult<List<PwRStatOrgVO>> getPwRStatOrgIndex(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatOrgIndex");
         List<PwRStatOrgVO> rStatOrg = pwRStatOrgService.getRStatOrgIndex(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
     }
 
     /**
-     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * 区域稳态指标合格率统计表-配网（稳态指标合格率统计）
      *
      * @param param
      * @return
      */
-    @PostMapping("/getRMpPassRateInfo")
+    @PostMapping("/getPwRMpPassRateInfo")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("稳态指标合格率明细表")
-    public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param) {
-        String methodDescribe = getMethodDescribe("getRMpPassRateInfo");
-        List<RStatOrgIndexVO> rStatOrg = rMpPassRateService.getRMpPassRateInfo(param);
+    public HttpResult<List<PwRStatOrgVO.PwRStatOrgDetailVO>> getPwRMpPassRateInfo(@RequestBody RStatOrgParam.PwRStatOrgParam param) {
+        String methodDescribe = getMethodDescribe("getPwRMpPassRateInfo");
+        List<PwRStatOrgVO.PwRStatOrgDetailVO> rStatOrg = pwRStatOrgService.getRMpPassRateInfo(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.njcn.harmonic.mapper.PwRStatOrgMapper">
+<mapper namespace="com.njcn.harmonic.mapper.distribution.PwRStatOrgMapper">
 
 
     <select id="selectListY" resultType="com.njcn.harmonic.pojo.vo.RStatOrgVO$PwRStatOrgVO">
@@ -19,12 +19,6 @@
         from r_stat_org_y
         <where>
             data_type = #{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_type_class IN
-                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
-                    #{item}
-                </foreach>
-            </if>
             <if test="deptIds != null and  deptIds.size > 0">
                 AND org_no IN
                 <foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
@@ -55,12 +49,6 @@
         from r_stat_org_q
         <where>
             data_type = #{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_type_class IN
-                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
-                    #{item}
-                </foreach>
-            </if>
             <if test="deptIds != null and  deptIds.size > 0">
                 AND org_no IN
                 <foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
@@ -91,12 +79,6 @@
         from r_stat_org_m
         <where>
             data_type = #{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_type_class IN
-                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
-                    #{item}
-                </foreach>
-            </if>
             <if test="deptIds != null and  deptIds.size > 0">
                 AND org_no IN
                 <foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java

@@ -26,8 +26,8 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
      * @param dataType
      * @return
      */
-    List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                            ,@Param("dataType") String dataType);
+    List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
+                                                            @Param("dataType") String dataType);
 
     /**
      * 获取月区域稳态指标合格率统计表
@@ -35,8 +35,8 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
      * @param dataType
      * @return
      */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                    ,@Param("dataType") String dataType);
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                                                    @Param("dataType") String dataType);
 
     /**
      * 配网获取月区域稳态指标合格率统计表
@@ -44,6 +44,6 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
      * @param dataType
      * @return
      */
-    List<PwRStatOrgVO> getPwMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
+    List<PwRStatOrgVO> getPwMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                               @Param("dataType") String dataType);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java

@@ -26,8 +26,8 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
      * @param dataType
      * @return
      */
-    List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                                ,@Param("dataType") String dataType);
+    List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
+                                                              @Param("dataType") String dataType);
 
     /**
      * 主网获取季区域稳态指标合格率统计表
@@ -35,8 +35,8 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
      * @param dataType
      * @return
      */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                            ,@Param("dataType") String dataType);
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                                                      @Param("dataType") String dataType);
 
     /**
      * 配网获取季区域稳态指标合格率统计表
@@ -44,6 +44,6 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
      * @param dataType
      * @return
      */
-    List<PwRStatOrgVO> getPwQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
+    List<PwRStatOrgVO> getPwQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                                 @Param("dataType") String dataType);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java

@@ -26,8 +26,8 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
      * @param dataType
      * @return
      */
-    List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
+    List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
+                                                           @Param("dataType") String dataType);
 
     /**
      * 主网获取年区域稳态指标合格率统计表
@@ -35,8 +35,8 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
      * @param dataType
      * @return
      */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                                                   @Param("dataType") String dataType);
 
     /**
      * 配网获取年区域稳态指标合格率统计表
@@ -44,6 +44,6 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
      * @param dataType
      * @return
      */
-    List<PwRStatOrgVO> getPwYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-            , @Param("dataType") String dataType);
+    List<PwRStatOrgVO> getPwYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
+                                              @Param("dataType") String dataType);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java

@@ -1,12 +1,13 @@
 package com.njcn.harmonic.service.distribution;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.RStatOrgQ;
 import com.njcn.harmonic.pojo.vo.PwRStatOrgVO;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrg2VO;
 
 import java.util.List;
 
@@ -34,4 +35,25 @@ public interface PwRStatOrgService extends IService<RStatOrgQ> {
      * @return
      */
     List<PwRStatOrgVO> getRStatOrgIndex(StatSubstationBizBaseParam param);
+
+    /**
+     * 配网稳态指标合格率明细表
+     * @param param
+     * @return
+     */
+    List<PwRStatOrgVO.PwRStatOrgDetailVO> getRMpPassRateInfo(RStatOrgParam.PwRStatOrgParam param);
+
+    /**
+     * 配网区域稳态指标超标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> getRStatSubstationOrg(StatSubstationBizBaseParam param);
+
+    /**
+     *配网区域稳态指标超标明细
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO> getRMpPartHarmonicDetail(StatSubstationBizBaseParam param);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java

@@ -8,20 +8,17 @@ import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.harmonic.mapper.distribution.PwRStatOrgMapper;
-import com.njcn.harmonic.mapper.majornetwork.RStatOrgMMapper;
-import com.njcn.harmonic.mapper.majornetwork.RStatOrgQMapper;
-import com.njcn.harmonic.mapper.majornetwork.RStatOrgYMapper;
+import com.njcn.harmonic.mapper.majornetwork.*;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.RStatOrgQ;
-import com.njcn.harmonic.pojo.vo.PwRStatOrgVO;
-import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+import com.njcn.harmonic.pojo.vo.*;
 import com.njcn.harmonic.service.distribution.PwRStatOrgService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
+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 org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
@@ -44,21 +41,28 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOrgQ> implements PwRStatOrgService {
 
-    private final DeptFeignClient deptFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
     private final PwRStatOrgMapper pwRStatOrgMapper;
     private final RStatOrgYMapper rStatOrgYMapper;
     private final RStatOrgQMapper rStatOrgQMapper;
     private final RStatOrgMMapper rStatOrgMMapper;
     private final PwMonitorClient pwMonitorClient;
+    private final RMpPassRateYMapper rMpPassRateYMapper;
+    private final RMpPassRateQMapper rMpPassRateQMapper;
+    private final RMpPassRateMMapper rMpPassRateMMapper;
+    private final RMpSurplusHarmonicDetailMMapper rMpSurplusHarmonicDetailMMapper;
 
 
     @Override
     public List<RStatOrgVO.PwRStatOrgVO> getRStatHarmonicAll(StatSubstationBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+
+        PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam();
+        pwPmsMonitorParam.setOrgId(param.getId());
+        pwPmsMonitorParam.setMonitorSort(param.getIds());
+        List<PwPmsMonitorDTO> data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
         //获取部门id集合
-        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+        List<String> deptIds = data.stream().map(PwPmsMonitorDTO::getOrgId).collect(Collectors.toList());
+        Map<String, PwPmsMonitorDTO> deptMap = data.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getOrgId, Function.identity()));
         //获取配网信息
         DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
         List<RStatOrgVO.PwRStatOrgVO> info = new ArrayList<>();
@@ -85,8 +89,9 @@ public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOr
             collect.forEach((key, value) -> {
                 if (deptMap.containsKey(key)) {
                     for (RStatOrgVO.PwRStatOrgVO org : value) {
-                        DeptDTO deptDTO = deptMap.get(key);
-                        org.setOrgName(deptDTO.getName());
+                        PwPmsMonitorDTO deptDTO = deptMap.get(key);
+                        org.setOrgName(deptDTO.getOrgName());
+                        org.setMonitorSort(deptDTO.getMonitorSort());
                         newList.add(org);
                     }
                 }
@@ -134,10 +139,303 @@ public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOr
             for (PwRStatOrgVO vo : info) {
                 if (dto.getOrgId().equals(vo.getOrgNo())) {
                     vo.setOrgNo(dto.getOrgId());
+                    vo.setMonitorSort(dto.getMonitorSort());
                     vo.setOrgName(dto.getOrgName());
                 }
             }
         }
         return info;
     }
+
+    @Override
+    public List<PwRStatOrgVO.PwRStatOrgDetailVO> getRMpPassRateInfo(RStatOrgParam.PwRStatOrgParam param) {
+        //初始化对象
+        List<RStatOrgIndexVO> info = new ArrayList<>();
+        // 获取当前用户的部门的子部门信息
+        PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam();
+        //部门id
+        pwPmsMonitorParam.setOrgId(param.getId());
+        //变电站
+        pwPmsMonitorParam.setPowerId(param.getPowerrIds());
+        //电压等级
+        pwPmsMonitorParam.setVoltageLevels(param.getVoltageLevels());
+        //监测点类别
+        pwPmsMonitorParam.setMonitorSort(param.getMonitorSort());
+        //监测点名称
+        pwPmsMonitorParam.setMonitorName(param.getMonitorName());
+        List<PwPmsMonitorDTO> monitorDTOList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        Map<String, PwPmsMonitorDTO> monitorDTOMap = monitorDTOList.stream().collect(
+                Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity()));
+
+        if (CollectionUtil.isNotEmpty(monitorDTOList)) {
+            //获取最新过滤的监测点id
+            List<String> ids = monitorDTOList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
+            baseParam.setIds(ids);
+            // 类型（1年 2季度 3月份
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年稳态指标合格率明细表
+                    info = rMpPassRateYMapper.getYearPassRate(baseParam);
+                    break;
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季稳态指标合格率明细表
+                    info = rMpPassRateQMapper.getQuarterPassRate(baseParam);
+                    break;
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月稳态指标合格率明细表
+                    info = rMpPassRateMMapper.getMonthPassRate(baseParam);
+                    break;
+                default:
+                    break;
+
+            }
+            if (CollectionUtil.isNotEmpty(info)) {
+                //初始化
+                List<PwRStatOrgVO.PwRStatOrgDetailVO> temp = new ArrayList<>();
+                //便利对象
+                Map<String, RStatOrgIndexVO> collect = info.stream()
+                        .collect(Collectors.toMap(RStatOrgIndexVO::getMeasurementPointId, Function.identity()));
+                collect.forEach((Key, value) -> {
+                    if (monitorDTOMap.containsKey(Key)) {
+                        //根据监测点信息，进行属性赋值
+                        PwPmsMonitorDTO pwPmsMonitorDTO = monitorDTOMap.get(Key);
+                        PwRStatOrgVO.PwRStatOrgDetailVO pwRStatOrgVO=new PwRStatOrgVO.PwRStatOrgDetailVO();
+                        pwRStatOrgVO.setMeasurementPointId(pwPmsMonitorDTO.getMonitorId());
+                        pwRStatOrgVO.setMeasurementPointName(pwPmsMonitorDTO.getMonitorName());
+                        pwRStatOrgVO.setMonitorVoltageName(pwPmsMonitorDTO.getVoltageLevel());
+                        pwRStatOrgVO.setPowerName(pwPmsMonitorDTO.getPowerName());
+                        pwRStatOrgVO.setOrgNo(pwPmsMonitorDTO.getOrgId());
+                        pwRStatOrgVO.setOrgName(pwPmsMonitorDTO.getOrgName());
+                        pwRStatOrgVO.setMonitorSort(pwPmsMonitorDTO.getMonitorSort());
+                        pwRStatOrgVO.setFreqPassRate(value.getFreqPassRate());
+                        pwRStatOrgVO.setVDevPassRate(value.getVDevPassRate());
+                        pwRStatOrgVO.setFlickerPassRate(value.getFlickerPassRate());
+                        temp.add(pwRStatOrgVO);
+                    }
+                });
+                return temp;
+            }
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> getRStatSubstationOrg(StatSubstationBizBaseParam param) {
+        PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam();
+        //部门id
+        pwPmsMonitorParam.setOrgId(param.getId());
+        //监测点类别
+        pwPmsMonitorParam.setMonitorSort(param.getIds());
+        //获取配网监测点信息
+        List<PwPmsMonitorDTO> monitorDTOList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        Map<String, PwPmsMonitorDTO> monitorDTOMap = monitorDTOList.stream().collect(
+                Collectors.toMap(PwPmsMonitorDTO::getOrgId, Function.identity()));
+
+        List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> info = new ArrayList<>();
+
+        if (CollectionUtil.isNotEmpty(monitorDTOList)) {
+            // 根据暂态指标枚举查询暂态指标
+            List<DictData> steadyStatis = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            List<RStatSubstationOrgVO> temp = new ArrayList<>();
+            // 过滤出部门id
+            List<String> deptIds = monitorDTOList.stream().map(PwPmsMonitorDTO::getOrgId).collect(Collectors.toList());
+            param.setIds(deptIds);
+
+            //获取配网信息
+            DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
+
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年区域暂态指标分类统计表
+                    temp = rStatOrgYMapper.getYearRStatHarmonicOrgInfo(param, distributionData.getId());
+                    break;
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季区域暂态指标分类统计表
+                    temp = rStatOrgQMapper.getQuarterRStatHarmonicOrgInfo(param, distributionData.getId());
+                    break;
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月区域暂态指标分类统计表
+                    temp = rStatOrgMMapper.getMonthRStatHarmonicOrgInfo(param, distributionData.getId());
+                    break;
+                default:
+                    break;
+            }
+            Map<String, List<RStatSubstationOrgVO>> map = temp
+                    .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo));
+            map.forEach((key, value) -> {
+                RStatSubstationOrg2VO.PwRStatSubstationOrgVO vo = new RStatSubstationOrg2VO.PwRStatSubstationOrgVO();
+                //获取部门信息
+                if (monitorDTOMap.containsKey(key)) {
+                    PwPmsMonitorDTO pwPmsMonitorDTO = monitorDTOMap.get(key);
+                    vo.setOrgName(pwPmsMonitorDTO.getOrgName());
+                    vo.setMonitorSort(pwPmsMonitorDTO.getMonitorSort());
+                }
+                vo.setOrgNo(value.get(0).getOrgNo());
+                vo.setDataDate(value.get(0).getDataDate());
+                vo.setEffectiveMeasurementAverage(value.get(0).getEffectiveMeasurementAverage());
+                vo.setEffectiveMeasurementAccrued(value.get(0).getEffectiveMeasurementAccrued());
+                vo.setHarmonicMeasurementAverage(value.get(0).getHarmonicMeasurementAverage());
+                vo.setHarmonicMeasurementAccrued(value.get(0).getHarmonicMeasurementAccrued());
+                vo.setHarmonicMeasurementRatioAverage(value.get(0).getHarmonicMeasurementRatioAverage());
+                vo.setHarmonicMeasurementRatioAccrued(value.get(0).getHarmonicMeasurementRatioAccrued());
+                //遍历赋值
+                for (RStatSubstationOrgVO orgVO : value) {
+                    for (DictData eventStati : steadyStatis) {
+                        if (eventStati.getId().equals(orgVO.getHarmonicType())) {
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.FREQUENCY_DEV)) {
+                                vo.setTAverage(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage(orgVO.getChainAverage());
+                                vo.setChainAccrued(orgVO.getChainAccrued());
+                                vo.setSameAverage(orgVO.getSameAverage());
+                                vo.setSameAccrued(orgVO.getSameAccrued());
+                                vo.setAverageOverDay(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.VOLTAGE_DEV)) {
+                                vo.setTAverage1(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued1(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage1(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued1(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage1(orgVO.getChainAverage());
+                                vo.setChainAccrued1(orgVO.getChainAccrued());
+                                vo.setSameAverage1(orgVO.getSameAverage());
+                                vo.setSameAccrued1(orgVO.getSameAccrued());
+                                vo.setAverageOverDay1(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.FLICKER)) {
+                                vo.setTAverage2(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued2(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage2(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued2(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage2(orgVO.getChainAverage());
+                                vo.setChainAccrued2(orgVO.getChainAccrued());
+                                vo.setSameAverage2(orgVO.getSameAverage());
+                                vo.setSameAccrued2(orgVO.getSameAccrued());
+                                vo.setAverageOverDay2(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_VOLTAGE)) {
+                                vo.setTAverage3(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued3(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage3(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued3(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage3(orgVO.getChainAverage());
+                                vo.setChainAccrued3(orgVO.getChainAccrued());
+                                vo.setSameAverage3(orgVO.getSameAverage());
+                                vo.setSameAccrued3(orgVO.getSameAccrued());
+                                vo.setAverageOverDay3(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_CURRENT)) {
+                                vo.setTAverage4(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued4(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage4(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued4(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage4(orgVO.getChainAverage());
+                                vo.setChainAccrued4(orgVO.getChainAccrued());
+                                vo.setSameAverage4(orgVO.getSameAverage());
+                                vo.setSameAccrued4(orgVO.getSameAccrued());
+                                vo.setAverageOverDay4(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.INTERHARMONIC_VOLTAGE)) {
+                                vo.setTAverage5(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued5(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage5(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued5(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage5(orgVO.getChainAverage());
+                                vo.setChainAccrued5(orgVO.getChainAccrued());
+                                vo.setSameAverage5(orgVO.getSameAverage());
+                                vo.setSameAccrued5(orgVO.getSameAccrued());
+                                vo.setAverageOverDay5(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.PHASE_VOLTAGE)) {
+                                vo.setTAverage6(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued6(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage6(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued6(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage6(orgVO.getChainAverage());
+                                vo.setChainAccrued6(orgVO.getChainAccrued());
+                                vo.setSameAverage6(orgVO.getSameAverage());
+                                vo.setSameAccrued6(orgVO.getSameAccrued());
+                                vo.setAverageOverDay6(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.NEG_CURRENT)) {
+                                vo.setTAverage7(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued7(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage7(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued7(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage7(orgVO.getChainAverage());
+                                vo.setChainAccrued7(orgVO.getChainAccrued());
+                                vo.setSameAverage7(orgVO.getSameAverage());
+                                vo.setSameAccrued7(orgVO.getSameAccrued());
+                                vo.setAverageOverDay7(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.TOTAL_INDICATOR)) {
+                                vo.setTAverage8(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued8(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage8(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued8(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage8(orgVO.getChainAverage());
+                                vo.setChainAccrued8(orgVO.getChainAccrued());
+                                vo.setSameAverage8(orgVO.getSameAverage());
+                                vo.setSameAccrued8(orgVO.getSameAccrued());
+                                vo.setAverageOverDay8(orgVO.getAverageOverDay());
+                            }
+
+                        }
+
+                    }
+                }
+                info.add(vo);
+            });
+            return info;
+        }
+        return Lists.newArrayList();
+    }
+
+    @Override
+    public List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO> getRMpPartHarmonicDetail(StatSubstationBizBaseParam param) {
+        PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam();
+        //部门id
+        pwPmsMonitorParam.setOrgId(param.getId());
+        //监测点类别
+        pwPmsMonitorParam.setMonitorSort(param.getIds());
+        //获取配网监测点信息
+        List<PwPmsMonitorDTO> pwPmsMonitorDTOS = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        Map<String, PwPmsMonitorDTO> pwPmsMonitorDTOMap = pwPmsMonitorDTOS.stream().collect(
+                Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity()));
+
+        if (CollectionUtil.isNotEmpty(pwPmsMonitorDTOS)) {
+            //获取监测点id
+            List<String> ids = pwPmsMonitorDTOS.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+            //筛选出数据库对应监测点
+            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
+            baseParam.setIds(ids);
+            List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpSurplusHarmonicDetailMMapper.getRMpPartHarmonicDetail(baseParam);
+            List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO> newList=BeanUtil.copyToList(
+                    rMpPartHarmonicDetail,RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO.class);
+            if (CollectionUtil.isNotEmpty(newList)) {
+                //因为只有月表，数据进行查询可能出现重复数据。进行分组
+                Map<String, List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO>> detailVOMap = newList.stream()
+                        .collect(Collectors.groupingBy(RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO::getMeasurementPointId));
+                detailVOMap.forEach((Key, value) -> {
+                    if (pwPmsMonitorDTOMap.containsKey(Key)) {
+                        PwPmsMonitorDTO dto1 = pwPmsMonitorDTOMap.get(Key);
+                        for (RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO rmp : value) {
+                            rmp.setOrgName(dto1.getOrgName());
+                            rmp.setPowerrName(dto1.getPowerName());
+                            rmp.setMeasurementPointName(dto1.getMonitorName());
+                            rmp.setMonitorSort(dto1.getMonitorSort());
+                            rmp.setMonitorVoltageName(dto1.getVoltageLevel());
+                        }
+
+                    }
+                });
+            }
+            return newList;
+        }
+        return Lists.newArrayList();
+    }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPassRateService.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface RMpPassRateService extends IService<RMpPassRateQ> {
 
     /**
-     * 稳态指标合格率明细表
+     * 主网稳态指标合格率明细表
      *
      * @param param
      * @return