From e8e0572485e5e06d2e37484067aa2d6dea29560c Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 1 Feb 2024 16:31:39 +0800
Subject: [PATCH] =?UTF-8?q?1.pms3.0=E4=B8=BB=E7=BD=91=E5=9F=BA=E5=87=86?=
 =?UTF-8?q?=E6=B0=B4=E5=B9=B3=E5=92=8C=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapping/PwMonitorMapper.xml  | 30 +++++++-------
 .../impl/IPwMonitorServiceImpl.java           |  7 +++-
 .../PwRMpMonitorAlarmCountMServiceImpl.java   |  4 +-
 .../impl/RMpPwAlarmDetailDServiceImpl.java    |  2 +-
 .../impl/StatationStatServiceImpl.java        |  8 ++--
 .../com/njcn/event/pojo/vo/RStatEventMVO.java | 20 +++++++++
 .../majornetwork/RStatEventController.java    | 13 ++++++
 .../majornetwork/RStatEventYMapper.java       | 18 ++++++++
 .../EventDistributionStatisticsMapper.xml     | 18 ++++----
 .../mapping/RStatEventYMapper.xml             | 41 +++++++++++++++++++
 .../mapping/RmpEventDetailMapper.xml          |  1 +
 .../Impl/EventMonitorReportServiceImpl.java   |  1 -
 .../Impl/RStatEventYServiceImpl.java          | 36 ++++++++++++++--
 .../majornetwork/RStatEventYService.java      | 11 +++++
 .../impl/RMpBenchmarkLevelMServiceImpl.java   | 26 +++---------
 .../impl/RMpBenchmarkLevelQServiceImpl.java   | 25 +++--------
 .../impl/RMpBenchmarkLevelYServiceImpl.java   | 25 +++--------
 17 files changed, 188 insertions(+), 98 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
index 13c190fde..5c75a175d 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
@@ -285,22 +285,22 @@
     </select>
     <select id="getPwMonitorDataNewList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
         SELECT
-        pdm.Org_Id AS orgId,
-        ps.Org_Name AS orgName,
-        pdm.`Power_Station_Id` AS powerId,
-        ps.`Power_Name` AS powerName,
-        pdm.Monitor_Id AS monitorId,
-        pdm.Line_Id,
-        pdm.Monitor_Sort AS monitorSort,
-        pdm.Voltage_Level AS voltageLevel,
-        pdm.If_Power_User AS if_powerUser,
-        pdm.Monitor_State AS monitorState,
-        pdm.Created_Date AS createdDate,
-        pdm.Terminal_Id AS terminalId,
-        pdm.Terminal_Wiring_Method AS terminalWiringMethod
+            pdm.Org_Id AS orgId,
+            ps.Org_Name AS orgName,
+            pdm.`Power_Station_Id` AS powerId,
+            ps.`Power_Name` AS powerName,
+            pdm.Monitor_Id AS monitorId,
+            pdm.Line_Id,
+            pdm.Monitor_Sort AS monitorSort,
+            pdm.Voltage_Level AS voltageLevel,
+            pdm.If_Power_User AS if_powerUser,
+            pdm.Monitor_State AS monitorState,
+            pdm.Created_Date AS createdDate,
+            pdm.Terminal_Id AS terminalId,
+            pdm.Terminal_Wiring_Method AS terminalWiringMethod
         FROM
-        pms_distribution_monitor pdm
-        INNER JOIN pms_statation_stat ps ON ps.Power_Id = pdm.Power_Station_Id
+            pms_distribution_monitor pdm
+        LEFT JOIN pms_statation_stat ps ON ps.Power_Id = pdm.Power_Station_Id
         <where>
             <if test="ids!=null and ids.size()!=0">
                 pdm.Monitor_Id IN
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java
index 8d424293c..1307abdfc 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java
@@ -19,6 +19,7 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -100,7 +101,11 @@ public class IPwMonitorServiceImpl implements IPwMonitorService {
         List<String> orgCodeList= deptInfos.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         List<PwPmsMonitorDTO> pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataNewList(orgCodeList,pwPmsMonitorParam.getIds(),pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam);
         List<String> ids = pwPmsMonitorDTOS.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
-        List<PwPmsMonitorDTO> pwMonitorName = pwMonitorMapper.getPwMonitorName(ids, pwPmsMonitorParam.getMonitorName());
+        List<List<String>> pendingIds = ListUtils.partition(ids, 50000);
+        List<PwPmsMonitorDTO> pwMonitorName=new ArrayList<>();
+        for (List<String> pendingId : pendingIds) {
+             pwMonitorName.addAll(pwMonitorMapper.getPwMonitorName(pendingId, pwPmsMonitorParam.getMonitorName()));
+        }
         Map<String, PwPmsMonitorDTO> monitorMap = pwPmsMonitorDTOS.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity()));
         pwMonitorName.stream().forEach(x->{
             if(monitorMap.containsKey(x.getMonitorId())){
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java
index 1ec2b0f07..8dd983998 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java
@@ -108,8 +108,8 @@ implements PwRMpMonitorAlarmCountMService {
         lambdaQueryWrapper
                 .in(RMpMonitorAlarmCountM::getMeasurementPointId, pwMonitorIds)
                 .ge(RMpMonitorAlarmCountM::getDataDate, startTime)
-                .le(RMpMonitorAlarmCountM::getDataDate, endTime)
-                .eq(RMpMonitorAlarmCountM::getDataType, dataType);
+                .le(RMpMonitorAlarmCountM::getDataDate, endTime);
+//                .eq(RMpMonitorAlarmCountM::getDataType, dataType);
         Page<RMpMonitorAlarmCountM> page = this.page(new Page<>(PageFactory.getPageNum(rMpMonitorAlarmCountMParam),PageFactory.getPageSize(rMpMonitorAlarmCountMParam)),lambdaQueryWrapper);
         List<RMpMonitorAlarmCountM> alarmCountMList = page.getRecords();
         List<PwRMpMonitorAlarmCountMVO> resultList;
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java
index 19fa35545..d4c20d1aa 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java
@@ -83,7 +83,7 @@ implements RMpPwAlarmDetailDService{
         //获取配网监测点
         PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
         pwPmsMonitorParam.setOrgId(deptIndex); //单位id
-        List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
+        List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwNewMonitorList(pwPmsMonitorParam);
         //配网监测点id集合
         List<String> pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
         //配网监测点Map集合
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java
index 8b0b04fb7..60b2194ac 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java
@@ -243,10 +243,10 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
     @Override
     public List<StatationStat> getPowerInfo(PmsStatationStatInfoParam param) {
         LambdaQueryWrapper<StatationStat> lqw = new LambdaQueryWrapper<>();
-        lqw.in(param.getOrgIds() != null, StatationStat::getOrgId, param.getOrgIds());
-        lqw.in(param.getPowerIds() != null, StatationStat::getPowerId, param.getPowerIds());
-        lqw.like(param.getPowerName() != null, StatationStat::getPowerName, param.getPowerName());
-        lqw.in(param.getPowerVoltageLevel() != null, StatationStat::getVoltageLevel, param.getPowerVoltageLevel());
+        lqw.in(CollUtil.isNotEmpty(param.getOrgIds()) , StatationStat::getOrgId, param.getOrgIds());
+        lqw.in(CollUtil.isNotEmpty(param.getPowerIds()), StatationStat::getPowerId, param.getPowerIds());
+        lqw.like(StrUtil.isNotBlank(param.getPowerName()), StatationStat::getPowerName, param.getPowerName());
+        lqw.in(CollUtil.isNotEmpty(param.getPowerVoltageLevel()), StatationStat::getVoltageLevel, param.getPowerVoltageLevel());
         return this.list(lqw);
     }
 
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java
index 99ae40f75..2dd44d257 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java
@@ -40,5 +40,25 @@ public class RStatEventMVO  {
     @ApiModelProperty(value = "累计发生暂态监测点数占比")
     private Float eventMeasurementRatioAccrued;
 
+    @Data
+    public static class Vo{
 
+        @ApiModelProperty(value = "单位id")
+        private String orgId;
+
+        @ApiModelProperty(value = "单位名称")
+        private String orgName;
+
+        @ApiModelProperty(value = "指标类型")
+        private String eventType;
+
+        @ApiModelProperty(value = "暂降发生次数")
+        private Integer eventCount;
+
+        @ApiModelProperty(value = "暂升发生次数")
+        private Integer riseCount;
+
+        @ApiModelProperty(value = "短时中断次数")
+        private Integer interruptCount;
+    }
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java
index f0e2d0726..540a6987c 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java
@@ -9,6 +9,7 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.event.pojo.param.REventMParam;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.event.pojo.vo.*;
 import com.njcn.event.service.majornetwork.RStatEventMService;
 import com.njcn.event.service.majornetwork.RStatEventQService;
@@ -18,6 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -96,6 +98,17 @@ public class RStatEventController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
     }
 
+    /**
+     * 区域暂态电能质量水平评估
+     */
+    @PostMapping("/getEventBenchmarkLevelList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域暂态电能质量水平评估")
+    public HttpResult<List<RStatEventMVO.Vo>> getEventBenchmarkLevelList(StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getEventBenchmarkLevelList");
+        List<RStatEventMVO.Vo> eventBenchmarkLevelList = rStatEventYService.getEventBenchmarkLevelList(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventBenchmarkLevelList, methodDescribe);
+    }
 
 }
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventYMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventYMapper.java
index 0f7dbe083..325e1d845 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventYMapper.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventYMapper.java
@@ -3,9 +3,11 @@ package com.njcn.event.mapper.majornetwork;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.event.pojo.po.RStatEventY;
+import com.njcn.event.pojo.vo.RStatEventMVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,20 @@ public interface RStatEventYMapper extends BaseMapper<RStatEventY> {
     List<RStatEventY> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
                                      @Param("dataType") String dataType);
 
+
+    /**
+     * 监测点数据查询
+     *
+     * @param ids
+     * @param param
+     * @param map
+     * @param dataType
+     * @return
+     */
+    List<RStatEventMVO.Vo> selectEventBenchmarkLevel(@Param("ids")List<String> ids,
+                                                     @Param("param") StatSubstationBizBaseParam param,
+                                                     @Param("map")Map<String, String> map,
+                                                     @Param("dataType") String dataType);
+
+
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
index abde612b7..2966b3e5b 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
@@ -89,8 +89,8 @@
         FROM
         (
         SELECT
-        duration,
-        feature_amplitude
+        duration * 1000 as duration,
+        feature_amplitude * 100 as feature_amplitude
         FROM
         r_mp_event_detail
         WHERE
@@ -140,7 +140,7 @@
         (
         SELECT
         measurement_point_id,
-        duration
+        duration*1000 as duration
         FROM
         r_mp_event_detail
         WHERE
@@ -184,7 +184,7 @@
         (
         SELECT
         measurement_point_id,
-        feature_amplitude
+        feature_amplitude * 100 as feature_amplitude
         FROM
         r_mp_event_detail
         WHERE
@@ -383,8 +383,8 @@
         FROM
         (
         SELECT
-        duration,
-        feature_amplitude
+        duration * 1000 as duration,
+        feature_amplitude * 100 as feature_amplitude
         FROM
         r_mp_event_detail
         WHERE 1 = 1
@@ -403,7 +403,6 @@
                 <if test="startTime != null and startTime != ''">
                     AND DATE_FORMAT(start_time, '%Y-%m') &gt;= SUBSTRING(#{startTime}, 1, 7)
                 </if>
-                -- 没写错，就是start_time， SUBSTRING第二个参数代表第一个字符开始，取7个字符
                 <if test="endTime != null and endTime != ''">
                     AND DATE_FORMAT(start_time, '%Y-%m') &lt;= SUBSTRING(#{endTime}, 1, 7)
                 </if>
@@ -435,8 +434,8 @@
         FROM
         (
         SELECT
-        duration,
-        feature_amplitude
+        duration * 1000 as duration,
+        feature_amplitude * 100 as feature_amplitude
         FROM
         r_mp_event_detail
         WHERE 1 = 1
@@ -444,7 +443,6 @@
         <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-
         AND event_type IN
         <foreach collection="eventTypeList" item="type" open="(" close=")" separator=",">
             #{type}
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
index af06651cc..b75889e86 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
@@ -47,5 +47,46 @@
         measurement_type_class,
         event_type
     </select>
+    <select id="selectEventBenchmarkLevel" resultType="com.njcn.event.pojo.vo.RStatEventMVO$Vo">
+        SELECT
+        org_no as orgId,
+        measurement_type_class,
+        SUM(IF(`event_type`=#{map.dip},event_count,0)) as eventCount,
+        SUM(IF(`event_type`=#{map.rise},event_count,0)) as riseCount,
+        SUM(IF(`event_type`=#{map.interrupt},event_count,0)) as interruptCount
+        FROM
+        <if test="param != null and  param.type == 1">
+            r_stat_event_y
+        </if>
+        <if test="param != null and  param.type == 2">
+            r_stat_event_q
+        </if>
+        <if test="param != null and  param.type == 3">
+            r_stat_event_m
+        </if>
+        <where>
+            <if test="ids != null and ids.size > 0">
+                AND org_no IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <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="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+
+        GROUP BY
+        org_no,monitoring_object
+    </select>
 
 </mapper>
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RmpEventDetailMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RmpEventDetailMapper.xml
index 7cc94c347..fd955a91d 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RmpEventDetailMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RmpEventDetailMapper.xml
@@ -65,6 +65,7 @@
         <if test="endTime != null and endTime != ''">
             AND DATE_FORMAT(start_time, '%Y-%m') &lt;= SUBSTRING(#{endTime}, 1, 7)
         </if>
+        order by start_time desc
     </select>
     <select id="getByEventId" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
         SELECT
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventMonitorReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventMonitorReportServiceImpl.java
index bdb7b05d9..f3a326b18 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventMonitorReportServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventMonitorReportServiceImpl.java
@@ -422,7 +422,6 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
         pmsMonitorParam.setMonitorName(monitorName); //监测点名称
         pmsMonitorParam.setOrgIds(orgCodeList); //单位codes
         List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
-
         return monitorList;
     }
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java
index add77653f..60a1925f3 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java
@@ -2,12 +2,10 @@ package com.njcn.event.service.majornetwork.Impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.event.mapper.majornetwork.RStatEventYMapper;
 import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.event.pojo.po.RStatEventM;
 import com.njcn.event.pojo.po.RStatEventY;
 import com.njcn.event.pojo.vo.RArrayVO;
 import com.njcn.event.pojo.vo.RStatEventMVO;
@@ -18,7 +16,6 @@ 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.RequestUtil;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -209,6 +206,39 @@ public class RStatEventYServiceImpl extends ServiceImpl<RStatEventYMapper, RStat
         return arrayVOList;
     }
 
+    @Override
+    public List<RStatEventMVO.Vo> getEventBenchmarkLevelList(StatSubstationBizBaseParam param) {
+        //获取暂态信息
+        Map<String, String> map = new HashMap<>(3);
+        //获取主网监测点
+        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+        List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        //获取所有子部门信息
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> ids = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+        //根据字典Code，取出字典id，拼入sql中
+        dictDataList.stream().forEach(dictData -> {
+            if (DicDataEnum.VOLTAGE_DIP.getCode().equals(dictData.getCode())) {
+                map.put("dip", dictData.getId());
+            }
+            if (DicDataEnum.VOLTAGE_RISE.getCode().equals(dictData.getCode())) {
+                map.put("rise", dictData.getId());
+            }
+            if (DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(dictData.getCode())) {
+                map.put("interrupt", dictData.getId());
+            }
+        });
+        //数据分页查询
+        List<RStatEventMVO.Vo> vos = this.baseMapper.selectEventBenchmarkLevel(ids, param, map, data.getId());
+        Map<String, String> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO::getName));
+        vos.forEach(vo -> {
+            if (deptDTOMap.containsKey(vo.getOrgId())) {
+                vo.setOrgName(deptDTOMap.get(vo.getOrgId()));
+            }
+        });
+        return vos;
+    }
+
     /**
      * 便利赋值
      *
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RStatEventYService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RStatEventYService.java
index b3b16aca5..5bb2db858 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RStatEventYService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RStatEventYService.java
@@ -2,8 +2,10 @@ package com.njcn.event.service.majornetwork;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.event.pojo.po.RStatEventY;
 import com.njcn.event.pojo.vo.RArrayVO;
+import com.njcn.event.pojo.vo.RStatEventMVO;
 
 import java.util.List;
 
@@ -32,4 +34,13 @@ public interface RStatEventYService extends IService<RStatEventY> {
      * @return
      */
     List<RArrayVO> getPwRStatEventYAll(StatisticsBizBaseParam param);
+
+
+    /**
+     * 区域暂态电能质量水平评估
+     *
+     * @param param
+     * @return
+     */
+    List<RStatEventMVO.Vo> getEventBenchmarkLevelList(StatSubstationBizBaseParam param);
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
index ee7a79553..f7b710fc5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
@@ -127,9 +127,9 @@ implements RMpBenchmarkLevelMService {
             return rMpBenchmarkLevelVO;
         }).collect(Collectors.toList());
         /*添加type在区分接口返回值*/
+        List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
         if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){
             Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
             collect.forEach ((k, v) ->{
                 RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
@@ -172,27 +172,11 @@ implements RMpBenchmarkLevelMService {
 
                 finalList.add (rMpBenchmarkLevelVO);
             });
-            return finalList;
-        }else if(
-                Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2")
-        ){
-            Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
-            collect.forEach ((k, v) ->{
-                RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
-                rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
-                rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ());
-
-                rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ());
-                rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ());
-                rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ());
-                finalList.add (rMpBenchmarkLevelVO);
-            });
-            return finalList;
-
         }
-
-        return resultList;
+        if(CollUtil.isNotEmpty(finalList)){
+            finalList.sort(Comparator.comparing(x->x.getOrgName()+";"+x.getVoltageLevelName()));
+        }
+        return finalList;
     }
 
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
index 69c3b1043..c937d2fd0 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
@@ -127,9 +127,9 @@ implements RMpBenchmarkLevelQService {
             return rMpBenchmarkLevelVO;
         }).collect(Collectors.toList());
         /*添加type在区分接口返回值*/
+        List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
         if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){
             Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
             collect.forEach ((k, v) ->{
                 RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
@@ -173,26 +173,11 @@ implements RMpBenchmarkLevelQService {
                 finalList.add (rMpBenchmarkLevelVO);
             });
             return finalList;
-        }else if(
-                Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2")
-        ){
-            Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
-            collect.forEach ((k, v) ->{
-                RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
-                rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
-                rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ());
-
-                rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ());
-                rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ());
-                rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ());
-                finalList.add (rMpBenchmarkLevelVO);
-            });
-            return finalList;
-
         }
-
-        return resultList;
+        if(CollUtil.isNotEmpty(finalList)){
+            finalList.sort(Comparator.comparing(x->x.getOrgName()+";"+x.getVoltageLevelName()));
+        }
+        return finalList;
     }
 
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
index 6b1d36ea0..9389c173a 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
@@ -128,9 +128,9 @@ implements RMpBenchmarkLevelYService {
             return rMpBenchmarkLevelVO;
         }).collect(Collectors.toList());
         /*添加type在区分接口返回值*/
+        List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
         if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){
             Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
             collect.forEach ((k, v) ->{
                 RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
@@ -174,26 +174,11 @@ implements RMpBenchmarkLevelYService {
                 finalList.add (rMpBenchmarkLevelVO);
             });
             return finalList;
-        }else if(
-                Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2")
-        ){
-            Map<String, List<RMpBenchmarkLevelVO>> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ()));
-            List<RMpBenchmarkLevelVO> finalList= new ArrayList<> ();
-            collect.forEach ((k, v) ->{
-                RMpBenchmarkLevelVO  rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
-                rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
-                rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ());
-
-                rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ());
-                rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ());
-                rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ());
-                finalList.add (rMpBenchmarkLevelVO);
-            });
-            return finalList;
-
         }
-
-        return resultList;
+        if(CollUtil.isNotEmpty(finalList)){
+            finalList.sort(Comparator.comparing(x->x.getOrgName()+";"+x.getVoltageLevelName()));
+        }
+        return finalList;
     }
 
 }