diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java
index c4ddae894..a6ff96c00 100644
--- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java
+++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java
@@ -76,6 +76,7 @@ public interface InfluxDBSqlConstant {
     String MAX = "MAX";
     String MIN = "MIN";
     String AVG = "MEAN";
+    String NUM_95 = ",95";
     String CP95 = "PERCENTILE";
 
     /**
diff --git a/pqs-common/common-influxdb/src/test/java/DataTest.java b/pqs-common/common-influxdb/src/test/java/DataTest.java
index 262ec2329..ef7be3776 100644
--- a/pqs-common/common-influxdb/src/test/java/DataTest.java
+++ b/pqs-common/common-influxdb/src/test/java/DataTest.java
@@ -1,9 +1,7 @@
 import cn.hutool.core.date.DateUtil;
-import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.influxdb.utils.InfluxDbUtils;
-import feign.Util;
 import org.influxdb.InfluxDB.ConsistencyLevel;
 import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java
index 1ba76ec80..b9fe9076b 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java
@@ -34,7 +34,7 @@ import java.util.stream.Stream;
 @Slf4j
 public class XssRequestWrapper extends HttpServletRequestWrapper {
 
-    private final static String[] WHITE_PARAMETER_NAME = {"password","mxContent","docContent","bgImage"};
+    private final static String[] WHITE_PARAMETER_NAME = {"password", "mxContent", "docContent", "bgImage"};
 
 
     public XssRequestWrapper(HttpServletRequest request) {
@@ -87,6 +87,7 @@ public class XssRequestWrapper extends HttpServletRequestWrapper {
             AntiSamy antiSamy = new AntiSamy();
             CleanResults scan = antiSamy.scan(html, policy);
             cleanHtml = scan.getCleanHTML();
+            cleanHtml = cleanHtml.replace("\n", "");
             // 对转义的HTML特殊字符（<、>、"等）进行反转义，因为AntiSamy调用scan方法时会将特殊字符转义
             cleanHtml = StringEscapeUtils.unescapeHtml4(cleanHtml);
         } catch (ScanException | PolicyException e) {
@@ -95,7 +96,6 @@ public class XssRequestWrapper extends HttpServletRequestWrapper {
         return cleanHtml;
     }
 
-
     /**
      * 过滤请求头
      *
@@ -190,9 +190,10 @@ public class XssRequestWrapper extends HttpServletRequestWrapper {
                 if (Objects.isNull(temp)) {
                     objects[i] = "";
                 } else if (temp instanceof Number || temp instanceof List) {
+//                    objects[i] = xssClean(Objects.isNull(temp) ? "" : temp.toString());
                     objects[i] = temp;
                 } else {
-                    objects[i] = xssClean(Objects.isNull(temp) ? "" : temp.toString());;
+                    objects[i] = temp;
                 }
             }
             finishJson = objectMapper.writeValueAsString(objects);
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
index da8ae027d..eda29b9fb 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
@@ -277,5 +277,24 @@ public interface LineFeignClient {
     @PostMapping("getLineDetailList")
     HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds);
 
-
+    /**
+     * @param subIndex
+     * @Description: 获取变电站下终端数
+     * @Param: [subIndex]
+     * @return: java.lang.Integer
+     * @Author: clam
+     * @Date: 2022/11/9
+     */
+    @PostMapping("/getDeviceCountBySubstation")
+    HttpResult<Integer> getDeviceCountBySubstation(@RequestParam("subIndex") String subIndex);
+    /**
+     * @param subIndex
+     * @Description: 获取变电站下监测点数
+     * @Param: [subIndex]
+     * @return: java.lang.Integer
+     * @Author: clam
+     * @Date: 2022/11/9
+     */
+    @PostMapping("/getLineCountBySubstation")
+    HttpResult<Integer> getLineCountBySubstation(@RequestParam("subIndex") String subIndex);
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
index eb26e16f4..0eeea9790 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
@@ -207,6 +207,18 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<Integer> getDeviceCountBySubstation(@RequestParam("subIndex") String subIndex){
+                log.error("{}异常，降级处理，异常为：{}", "获取变电站下终端数:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Integer> getLineCountBySubstation(@RequestParam("subIndex") String subIndex) {
+                log.error("{}异常，降级处理，异常为：{}", "获取变电站下监测点数:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
 
         };
     }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
index cb2791283..48511986a 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
@@ -139,6 +139,9 @@ public class DeviceInfoParam implements Serializable {
         @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月")
         private Integer timeFlag;
 
+        @ApiModelProperty("报表统计类型 1.年 2.季 3.月 4.周 5.天")
+        private String reportFlag;
+
     }
 
     @Data
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
index 18e345de0..74a924353 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
@@ -400,4 +400,23 @@ public class LineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe);
     }
 
+
+    @PostMapping("/getLineCountBySubstation")
+    @ApiOperation("获取变电站下监测点数")
+    @ApiImplicitParam(name = "subIndex", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true)
+    public HttpResult<Integer> getLineCountBySubstation(@RequestParam("subIndex") String subIndex) {
+        String methodDescribe = getMethodDescribe("getLineBySubstationRelation");
+        Integer count = lineService.getLineCountBySubstation(subIndex);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe);
+    }
+
+    @PostMapping("/getDeviceCountBySubstation")
+    @ApiOperation("获取变电站下终端数")
+    @ApiImplicitParam(name = "subIndex", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true)
+    public HttpResult<Integer> getDeviceCountBySubstation(@RequestParam("subIndex") String subIndex) {
+        String methodDescribe = getMethodDescribe("getDeviceCountBySubstation");
+        Integer count = lineService.getDeviceCountBySubstation(subIndex);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe);
+    }
+
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
index aa97fa3bb..750928da5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -41,5 +42,9 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
      * @return 结果
      */
     List<LineDetailDataVO> getLineDetailInfo(@Param("lineIds") List<String> lineIds);
+    @Select ("select count(1) from pq_line a where a.`Level`=4 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
+    Integer getDeviceCountBySubstation(@Param("subIndex")String subIndex);
 
+    @Select ("select count(1) from pq_line a where a.`Level`=6 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
+    Integer getLineCountBySubstation(@Param("subIndex")String subIndex);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
index dab667750..63429cd74 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
@@ -176,4 +176,20 @@ public interface LineService {
      * @date 2022/10/26
      */
     List<LineDetailDataVO> getLineDetailList(List<String> lineIds);
+    /**
+    * @Description: 获取变电站下终端数
+    * @Param: [subIndex]
+    * @return: java.lang.Integer
+    * @Author: clam
+    * @Date: 2022/11/9
+    */
+    Integer getDeviceCountBySubstation(String subIndex);
+    /**
+    * @Description: 获取变电站下监测点数
+     * @Param: [subIndex]
+    * @return: java.lang.Integer
+    * @Author: clam
+    * @Date: 2022/11/9
+    */
+    Integer getLineCountBySubstation(String subIndex);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index 1b430e6c6..6bb78d68c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -801,6 +801,38 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return lineDetailMapper.getLineDetailInfo(lineIds);
     }
 
+    /**
+     * @param subIndex
+     * @Description: 获取变电站下终端数
+     * @Param: [subIndex]
+     * @return: java.lang.Integer
+     * @Author: clam
+     * @Date: 2022/11/9
+     */
+    @Override
+    public Integer getDeviceCountBySubstation(String subIndex) {
+
+        Integer count = lineDetailMapper.getDeviceCountBySubstation(subIndex);
+
+        return count;
+    }
+
+    /**
+     * @param subIndex
+     * @Description: 获取变电站下监测点数
+     * @Param: [subIndex]
+     * @return: java.lang.Integer
+     * @Author: clam
+     * @Date: 2022/11/9
+     */
+    @Override
+    public Integer getLineCountBySubstation(String subIndex) {
+
+        Integer count = lineDetailMapper.getLineCountBySubstation(subIndex);
+
+        return count;
+    }
+
     /**
      * 根据用户选择的时间区间返回月份日期
      */
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventMonitorReportVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventMonitorReportVO.java
index 377436a1d..8b331b545 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventMonitorReportVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventMonitorReportVO.java
@@ -1,5 +1,6 @@
 package com.njcn.event.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,25 +17,35 @@ public class EventMonitorReportVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(name = "date", value = "时间")
     private String date; //时间
 
+    @ApiModelProperty(name = "orgId", value = "单位id")
     private String orgId; // 单位id
 
-    private String OrgName; //单位名称
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName; //单位名称
 
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
     private String monitorId; //监测点id
 
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
     private String monitorName; //监测点名称
 
+    @ApiModelProperty(name = "voltageLevel", value = "监测点电压等级id")
     private String voltageLevel; //监测点电压等级id
 
+    @ApiModelProperty(name = "voltageLevelName", value = "监测点电压等级名称")
     private String voltageLevelName; //监测点电压等级名称
 
+    @ApiModelProperty(name = "voltageRiseCount", value = "电压暂升次数")
     private Integer voltageRiseCount; //电压暂升次数
 
+    @ApiModelProperty(name = "voltageDipCount", value = "电压暂降次数")
     private Integer voltageDipCount; //电压暂降次数
 
-    private Integer shortInterruptionCount; //短时中断
+    @ApiModelProperty(name = "shortInterruptionCount", value = "短时中断次数")
+    private Integer shortInterruptionCount; //短时中断次数
 
 //    private EventDipShortDistributionVO dipShortStatisticsVO; //暂降和短时中断分部情况
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventMonitorReportController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventMonitorReportController.java
index afba8895c..e3fde02a6 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventMonitorReportController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventMonitorReportController.java
@@ -6,9 +6,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.event.pojo.param.EventMonitorReportParam;
-import com.njcn.event.pojo.vo.EventDipShortDistributionVO;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
+import com.njcn.event.pojo.vo.*;
 import com.njcn.event.service.majornetwork.EventMonitorReportService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -37,30 +35,53 @@ public class EventMonitorReportController extends BaseController {
 
     private final EventMonitorReportService eventMonitorReportService;
 
-    @PostMapping("getDailyReport")
+    /***
+     * @author jianghaifei
+     * @date 2022-10-29 16:37
+     * @param eventMonitorReportParam
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.event.pojo.vo.EventMonitorReportVO>>
+     */
+    @PostMapping("getMonitorEventCount")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("暂态指标监测点日报")
-    public HttpResult<List<EventMonitorReportVO>> getDailyReport(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
-        String methodDescribe = getMethodDescribe("getDailyReport");
-        List<EventMonitorReportVO> list = eventMonitorReportService.getDailyReport(eventMonitorReportParam);
+    @ApiOperation("监测点暂态事件发生次数")
+    public HttpResult<List<EventMonitorReportVO>> getMonitorEventCount(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+        String methodDescribe = getMethodDescribe("getMonitorEventCount");
+        List<EventMonitorReportVO> list = eventMonitorReportService.getMonitorEventCount(eventMonitorReportParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    /***
+     * 
+     * @author jianghaifei
+     * @date 2022-10-29 14:08
+     * @param eventMonitorReportParam
+     * @return com.njcn.common.pojo.response.HttpResult<com.njcn.event.pojo.vo.EventDipShortDistributionVO>
+     */
     @PostMapping("getEventDipShortDistribution")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("暂态指标监测点电压暂降和短时中断分布情况")
-    public HttpResult<EventDipShortDistributionVO> getEventDipShortDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+    public HttpResult<List<EventDipShortDistributionTableVO>> getEventDipShortDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
         String methodDescribe = getMethodDescribe("getEventDipShortDistribution");
-        EventDipShortDistributionVO eventDipShortDistributionVO = eventMonitorReportService.getEventDipShortDistributionByCond(eventMonitorReportParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventDipShortDistributionVO, methodDescribe);
+        List<EventDipShortDistributionTableVO> list = eventMonitorReportService.getEventDipShortDistributionByCond(eventMonitorReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    /***
+     * 
+     * @author jianghaifei
+     * @date 2022-10-29 14:08
+     * @param eventMonitorReportParam
+     * @return com.njcn.common.pojo.response.HttpResult<com.njcn.event.pojo.vo.EventRiseDistributionVO>
+     */
     @PostMapping("getEventRiseDistribution")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("暂态指标监测点电压暂升分布情况")
-    public HttpResult<EventRiseDistributionVO> getEventRiseDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+    public HttpResult<List<EventRiseDistributionTableVO>> getEventRiseDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
         String methodDescribe = getMethodDescribe("getEventRiseDistribution");
-        EventRiseDistributionVO eventRiseDistributionVO = eventMonitorReportService.getEventRiseDistributionByCond(eventMonitorReportParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventRiseDistributionVO, methodDescribe);
+        List<EventRiseDistributionTableVO> list = eventMonitorReportService.getEventRiseDistributionByCond(eventMonitorReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
+
+
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRmpEventDetailMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRmpEventDetailMapper.java
index f4cf68510..5ff22e816 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRmpEventDetailMapper.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRmpEventDetailMapper.java
@@ -2,6 +2,7 @@ package com.njcn.event.mapper.distribution;
 
 import com.njcn.event.pojo.param.UniversalFrontEndParam;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +24,34 @@ public interface PwRmpEventDetailMapper {
      * @date 2022/10/31
      */
     List<RmpEventDetailPO> getPwRmpEventDetail(UniversalFrontEndParam param);
+
+    /**
+     * 获取暂态事件明细
+     *
+     * @param monitorIds 监测点id
+     * @param eventType  暂态指标类型
+     * @param startTime  开始时间
+     * @param endTime    结束时间
+     * @return 暂态事件明细
+     */
+    List<RmpEventDetailPO> getDetailsOfTransientEvents(@Param("monitorIds") List<String> monitorIds,
+                                                       @Param("eventType") List<String> eventType,
+                                                       @Param("startTime") String startTime,
+                                                       @Param("endTime") String endTime);
+
+    /***
+     * 与上面的方法区别是日期精确到月 yy-MM
+     * @author jianghaifei
+     * @date 2022-10-31 16:27
+     * @param monitorIds
+     * @param eventType
+     * @param startTime
+     * @param endTime
+     * @return java.util.List<com.njcn.event.pojo.po.RmpEventDetailPO>
+     */
+    List<RmpEventDetailPO> getDetailsOfTransientEventsByMonth(@Param("monitorIds") List<String> monitorIds,
+                                                              @Param("eventType") List<String> eventType,
+                                                              @Param("startTime") String startTime,
+                                                              @Param("endTime") String endTime);
+
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
index 59e416d83..fadecbb32 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
@@ -17,4 +17,70 @@
         FROM
             r_mp_event_detail
     </select>
+
+    <select id="getDetailsOfTransientEvents" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+        event_id as eventId,
+        measurement_point_id as measurementPointId,
+        Event_Type as eventType,
+        start_time as startTime,
+        Duration as duration,
+        feature_amplitude as featureAmplitude,
+        phase as phase,
+        event_describe as eventDescribe,
+        wave_path as wavePath
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="eventType != null and eventType.size() >0">
+            AND Event_Type IN
+            <foreach collection="eventType" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+    </select>
+
+
+    <!--  获取暂态事件明细 与上面的方法区别是日期精确到月 yy-MM -->
+    <select id="getDetailsOfTransientEventsByMonth" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+        event_id as eventId,
+        measurement_point_id as measurementPointId,
+        Event_Type as eventType,
+        start_time as startTime,
+        Duration as duration,
+        feature_amplitude as featureAmplitude,
+        phase as phase,
+        event_describe as eventDescribe,
+        wave_path as wavePath
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="eventType != null and eventType.size() >0">
+            AND Event_Type IN
+            <foreach collection="eventType" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m') &lt;= #{endTime}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventDetailMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventDetailMapper.java
index 90b4f880c..2e3ae9ed6 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventDetailMapper.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventDetailMapper.java
@@ -30,4 +30,19 @@ public interface RmpEventDetailMapper extends BaseMapper<RmpEventDetailVO> {
                                                        @Param("eventType") List<String> eventType,
                                                        @Param("startTime") String startTime,
                                                        @Param("endTime") String endTime);
+
+    /***
+     * 与上面的方法区别是日期精确到月 yy-MM
+     * @author jianghaifei
+     * @date 2022-10-31 16:27
+     * @param monitorIds
+     * @param eventType
+     * @param startTime
+     * @param endTime
+     * @return java.util.List<com.njcn.event.pojo.po.RmpEventDetailPO>
+     */
+    List<RmpEventDetailPO> getDetailsOfTransientEventsByMonth(@Param("monitorIds") List<String> monitorIds,
+                                                       @Param("eventType") List<String> eventType,
+                                                       @Param("startTime") String startTime,
+                                                       @Param("endTime") String endTime);
 }
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 b5cbcddd9..e96fbda8e 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
@@ -387,12 +387,24 @@
             #{type}
         </foreach>
 
-        <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
-        </if>
+        <choose>
+            <when test="dateType != null and dateType == 3">
+                <if test="startTime != null and startTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m') &lt;= #{endTime}
+                </if>
+            </when>
+            <when test="dateType != null and dateType == 5">
+                <if test="startTime != null and startTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= #{startTime}
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= #{endTime}
+                </if>
+            </when>
+        </choose>
         )
         r
     </select>
@@ -426,12 +438,24 @@
             #{type}
         </foreach>
 
-        <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
-        </if>
+        <choose>
+            <when test="dateType != null and dateType == 3">
+                <if test="startTime != null and startTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m') &lt;= #{endTime}
+                </if>
+            </when>
+            <when test="dateType != null and dateType == 5">
+                <if test="startTime != null and startTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= #{startTime}
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= #{endTime}
+                </if>
+            </when>
+        </choose>
         )
         r
     </select>
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 3c36ef42b..a63a089e6 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
@@ -32,4 +32,37 @@
             AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
         </if>
     </select>
+
+<!--  获取暂态事件明细 与上面的方法区别是日期精确到月 yy-MM -->
+    <select id="getDetailsOfTransientEventsByMonth" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+        event_id as eventId,
+        measurement_point_id as measurementPointId,
+        Event_Type as eventType,
+        start_time as startTime,
+        Duration as duration,
+        feature_amplitude as featureAmplitude,
+        phase as phase,
+        event_describe as eventDescribe,
+        wave_path as wavePath
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="eventType != null and eventType.size() >0">
+            AND Event_Type IN
+            <foreach collection="eventType" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m') &lt;= #{endTime}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventMonitorReportService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventMonitorReportService.java
index 7dcf66422..38eb5ee86 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventMonitorReportService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventMonitorReportService.java
@@ -1,9 +1,7 @@
 package com.njcn.event.service.majornetwork;
 
 import com.njcn.event.pojo.param.EventMonitorReportParam;
-import com.njcn.event.pojo.vo.EventDipShortDistributionVO;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
+import com.njcn.event.pojo.vo.*;
 
 import java.util.List;
 
@@ -16,9 +14,12 @@ import java.util.List;
  */
 public interface EventMonitorReportService {
 
-    List<EventMonitorReportVO> getDailyReport(EventMonitorReportParam eventMonitorReportParam);
+    //监测点暂态事件发生次数
+    List<EventMonitorReportVO> getMonitorEventCount(EventMonitorReportParam eventMonitorReportParam);
 
-    EventDipShortDistributionVO getEventDipShortDistributionByCond(EventMonitorReportParam eventMonitorReportParam);
+    //暂态指标监测点电压暂降和短时中断分布情况
+    List<EventDipShortDistributionTableVO> getEventDipShortDistributionByCond(EventMonitorReportParam eventMonitorReportParam);
 
-    EventRiseDistributionVO getEventRiseDistributionByCond(EventMonitorReportParam eventMonitorReportParam);
+    //暂态指标监测点电压暂升分布情况
+    List<EventRiseDistributionTableVO> getEventRiseDistributionByCond(EventMonitorReportParam eventMonitorReportParam);
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
index 6b5f1ddc2..c0db34555 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
@@ -68,7 +68,7 @@ public class EventDetailServiceImpl implements EventDetailService {
     public List<EventDetail> getEventDetail(List<String> lineIndexes, String startTime, String endTime, List<Integer> waveType) {
         //组装sql语句
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and ");
+        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and (");
         for (int i = 0; i < lineIndexes.size(); i++) {
             if (lineIndexes.size() - i != 1) {
                 stringBuilder.append("line_id ='").append(lineIndexes.get(i)).append("' or ");
@@ -76,18 +76,18 @@ public class EventDetailServiceImpl implements EventDetailService {
                 stringBuilder.append("line_id ='").append(lineIndexes.get(i)).append("' ");
             }
         }
-        stringBuilder.append(" and ");
+        stringBuilder.append(") and (");
         for (int i = 0; i < waveType.size(); i++) {
             if (waveType.size() - i != 1) {
-                stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' or ");
+                stringBuilder.append("wave_type =").append(waveType.get(i)).append(" or ");
             } else {
-                stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' ");
+                stringBuilder.append("wave_type =").append(waveType.get(i)).append(" ");
             }
         }
+        stringBuilder.append(") order by time desc ");
         stringBuilder.append(" tz('Asia/Shanghai')");
         //sql语句
         String sql = "SELECT * FROM pqs_eventdetail WHERE " + stringBuilder;
-        System.out.println("sql------------->>>"+sql);
         //结果集
         QueryResult result = influxDbUtils.query(sql);
         //结果集映射到对象中
@@ -102,7 +102,7 @@ public class EventDetailServiceImpl implements EventDetailService {
     public List<EventDetail> getEventDetailLimit(List<String> lineIndexes, String startTime, String endTime, Integer pageSize, Integer pageNum, List<Integer> waveType) {
         //组装sql语句
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and ");
+        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and (");
         for (int i = 0; i < lineIndexes.size(); i++) {
             if (lineIndexes.size() - i != 1) {
                 stringBuilder.append("line_id ='").append(lineIndexes.get(i)).append("' or ");
@@ -110,20 +110,19 @@ public class EventDetailServiceImpl implements EventDetailService {
                 stringBuilder.append("line_id ='").append(lineIndexes.get(i)).append("' ");
             }
         }
-
-        stringBuilder.append(" and ");
+        stringBuilder.append(") and (");
         for (int i = 0; i < waveType.size(); i++) {
             if (waveType.size() - i != 1) {
-                stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' or ");
+                stringBuilder.append("wave_type =").append(waveType.get(i)).append(" or ");
             } else {
-                stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' ");
+                stringBuilder.append("wave_type =").append(waveType.get(i)).append(" ");
             }
         }
+        stringBuilder.append(") order by time desc ");
         int i = (pageNum - 1)*pageSize;
         stringBuilder.append("LIMIT ").append(pageSize).append(" OFFSET ").append(i).append(" tz('Asia/Shanghai')");
         //sql语句
         String sql = "SELECT * FROM pqs_eventdetail WHERE " + stringBuilder;
-        System.out.println(sql);
         //结果集
         QueryResult result = influxDbUtils.query(sql);
         //结果集映射到对象中
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 01919bbd5..89b8edad0 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
@@ -1,6 +1,7 @@
 package com.njcn.event.service.majornetwork.Impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
@@ -10,9 +11,7 @@ import com.njcn.event.mapper.majornetwork.EventDistributionStatisticsMapper;
 import com.njcn.event.mapper.majornetwork.RmpEventDetailMapper;
 import com.njcn.event.pojo.param.EventMonitorReportParam;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
-import com.njcn.event.pojo.vo.EventDipShortDistributionVO;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
+import com.njcn.event.pojo.vo.*;
 import com.njcn.event.service.majornetwork.EventMonitorReportService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -49,21 +48,39 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
     private final EventDistributionStatisticsMapper eventDistributionStatisticsMapper;
 
 
+    /***
+     * 监测点暂态事件发生次数
+     * @author jianghaifei
+     * @date 2022-10-29 18:05
+     * @param eventMonitorReportParam
+     * @return java.util.List<com.njcn.event.pojo.vo.EventMonitorReportVO>
+     */
     @Override
-    public List<EventMonitorReportVO> getDailyReport(EventMonitorReportParam eventMonitorReportParam) {
+    public List<EventMonitorReportVO> getMonitorEventCount(EventMonitorReportParam eventMonitorReportParam) {
         //提取查询参数
-        String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
-        String id = eventMonitorReportParam.getId(); //单位id
+//        String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
+//        String id = eventMonitorReportParam.getId(); //单位id
         String startTime = eventMonitorReportParam.getStartTime(); //开始时间
-        String endTime = eventMonitorReportParam.getEndTime(); //截止时间
+        String endTime = eventMonitorReportParam.getEndTime(); //结束时间
+        Integer type = eventMonitorReportParam.getType(); //时间类型（日/月）
 
+        /****** 获取监测点信息(version1.0) ******/
         //获取所有子部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
-        if (CollUtil.isEmpty(deptDTOList)) {
-            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
-        }
-        //单位id集合
-        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+//        if (CollUtil.isEmpty(deptDTOList)) {
+//            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+//        }
+//        //单位id集合
+//        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        //查询监测点信息（version1.0）
+//        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
+//        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
+//        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
+//        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
+        //查询监测点信息 (version2.0)
+        List<PmsMonitorDTO> monitorList = this.getMonitorList(eventMonitorReportParam);
+        List<String> monitorIdList = monitorList.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList()); //监测点id信息
+        Map<String, PmsMonitorDTO> monitorMap = monitorList.stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor));
 
         //获取电压等级的字典
         List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
@@ -74,18 +91,17 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
         //将暂态指标信息转成map，key：id  value：实体
         Map<String, DictData> eventStatisMap = eventStatisList.stream().collect(Collectors.toMap(DictData::getId, data -> data));
         //将暂态指标信息转成map，key：code  value：实体
-        Map<String, DictData> eventStatisMapByCode = eventStatisList.stream().collect(Collectors.toMap(DictData::getCode, data -> data));
-
-        //查询监测点信息
-        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
-        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
-        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
-        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
-        List<String> monitorIdList = monitorList.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList()); //监测点id信息
-        Map<String, PmsMonitorDTO> monitorMap = monitorList.stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor));
+//        Map<String, DictData> eventStatisMapByCode = eventStatisList.stream().collect(Collectors.toMap(DictData::getCode, data -> data));
 
         //查询暂态事件明细
-        List<RmpEventDetailPO> detailList = rmpEventDetailMapper.getDetailsOfTransientEvents(monitorIdList, null, startTime, endTime);
+        List<RmpEventDetailPO> detailList;
+        if (BizParamConstant.STAT_BIZ_MONTH.equals(type + "")) { //按月查
+            detailList = rmpEventDetailMapper.getDetailsOfTransientEventsByMonth(monitorIdList, null, startTime, endTime);
+        } else { //按日查
+            detailList = rmpEventDetailMapper.getDetailsOfTransientEvents(monitorIdList, null, startTime, endTime);
+        }
+
+
         Map<String, List<RmpEventDetailPO>> groupByMIdDetailMap = detailList.stream().collect(Collectors.groupingBy(RmpEventDetailPO::getMeasurementPointId, Collectors.toList()));
         List<EventMonitorReportVO> resultList = new ArrayList<>();
         groupByMIdDetailMap.forEach((key, monitorEventDetailList) -> {
@@ -105,19 +121,21 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
             Map<String, List<RmpEventDetailPO>> countMap = monitorEventDetailList.stream().collect(Collectors.groupingBy(RmpEventDetailPO::getEventType, Collectors.toList()));
             countMap.forEach((countKey, value) -> {
                 String code = eventStatisMap.get(countKey).getCode();
-                switch (code) {
-                    case "Voltage_Dip":
-                        eventMonitorReportVO.setVoltageDipCount(CollUtil.isNotEmpty(value) ? value.size() : 0); //电压暂降次数
-                        break;
-                    case "Voltage_Rise":
-                        eventMonitorReportVO.setVoltageRiseCount(CollUtil.isNotEmpty(value) ? value.size() : 0); //电压暂升次数
-                        break;
-                    case "Short_Interruptions":
-                        eventMonitorReportVO.setShortInterruptionCount(CollUtil.isNotEmpty(value) ? value.size() : 0); //短时中断
-                        break;
-                    default: break;
+                //电压暂降次数
+                if (DicDataEnum.VOLTAGE_DIP.getCode().equalsIgnoreCase(code)) {
+                    eventMonitorReportVO.setVoltageDipCount(CollUtil.isNotEmpty(value) ? value.size() : 0);
                 }
+                //电压暂升次数
+                if (DicDataEnum.VOLTAGE_RISE.getCode().equalsIgnoreCase(code)) {
+                    eventMonitorReportVO.setVoltageRiseCount(CollUtil.isNotEmpty(value) ? value.size() : 0);
+                }
+                //短时中断
+                if (DicDataEnum.SHORT_INTERRUPTIONS.getCode().equalsIgnoreCase(code)) {
+                    eventMonitorReportVO.setShortInterruptionCount(CollUtil.isNotEmpty(value) ? value.size() : 0);
+                }
+
             });
+            //重新校验设置属性值，避免值是null
             eventMonitorReportVO.setVoltageDipCount(eventMonitorReportVO.getVoltageDipCount() == null ? 0 : eventMonitorReportVO.getVoltageDipCount());
             eventMonitorReportVO.setVoltageRiseCount(eventMonitorReportVO.getVoltageRiseCount() == null ? 0 : eventMonitorReportVO.getVoltageRiseCount());
             eventMonitorReportVO.setShortInterruptionCount(eventMonitorReportVO.getShortInterruptionCount() == null ? 0 : eventMonitorReportVO.getShortInterruptionCount());
@@ -154,25 +172,29 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
      * @return com.njcn.event.pojo.vo.EventDipShortDistributionVO
      */
     @Override
-    public EventDipShortDistributionVO getEventDipShortDistributionByCond(EventMonitorReportParam eventMonitorReportParam) {
+    public List<EventDipShortDistributionTableVO> getEventDipShortDistributionByCond(EventMonitorReportParam eventMonitorReportParam) {
         //提取参数
-        String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
-        String id = eventMonitorReportParam.getId(); //单位id
+//        String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
+//        String id = eventMonitorReportParam.getId(); //单位id
         String startTime = eventMonitorReportParam.getStartTime(); //开始时间
         String endTime = eventMonitorReportParam.getEndTime(); //结束时间
+        Integer type = eventMonitorReportParam.getType(); //时间类型（日/月）
 
-        //获取所有子部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
-        if (CollUtil.isEmpty(deptDTOList)) {
-            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
-        }
-        //单位id集合
-        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        //查询监测点信息
-        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
-        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
-        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
-        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
+        /****** 获取监测点信息(version1.0) ******/
+//        //获取所有子部门信息
+//        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+//        if (CollUtil.isEmpty(deptDTOList)) {
+//            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+//        }
+//        //单位id集合
+//        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        //查询监测点信息
+//        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
+//        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
+//        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
+//        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
+        //查询监测点信息(version2.0)
+        List<PmsMonitorDTO> monitorList = this.getMonitorList(eventMonitorReportParam);
         List<String> monitorIdList = monitorList.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList()); //监测点id集合
 
         //获取暂态指标的字典
@@ -186,17 +208,207 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
         condMap.put("startTime", startTime);
         condMap.put("endTime", endTime);
         condMap.put("eventTypeList", Arrays.asList(eventStatisMapByCode.get(DicDataEnum.VOLTAGE_DIP.getCode()).getId(), eventStatisMapByCode.get(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getId()));
+        condMap.put("dateType", type);
+        EventDipShortDistributionVO eventDipShortDistribution = eventDistributionStatisticsMapper.getEventDipShortDistributionByCond(condMap);
 
-        return eventDistributionStatisticsMapper.getEventDipShortDistributionByCond(condMap);
+        //设置返回数据
+        List<EventDipShortDistributionTableVO> list = new ArrayList<>();
+        //特征幅值[80,90]
+        EventDipShortDistributionTableVO entity8090 = new EventDipShortDistributionTableVO();
+        entity8090.setFeatureAmplitude("[80,90]");
+        entity8090.setDuration100(eventDipShortDistribution.getFeatureAmp90with100ms()); //持续时间10ms-100ms
+        entity8090.setDuration250(eventDipShortDistribution.getFeatureAmp90with250ms()); //持续时间100ms-250ms
+        entity8090.setDuration500(eventDipShortDistribution.getFeatureAmp90with500ms()); //持续时间250ms-500ms
+        entity8090.setDuration1000(eventDipShortDistribution.getFeatureAmp90with1000ms()); //持续时间500ms-1000ms
+        entity8090.setDuration3000(eventDipShortDistribution.getFeatureAmp90with3000ms()); //持续时间1000ms-3000ms
+        entity8090.setDuration10000(eventDipShortDistribution.getFeatureAmp90with10000ms()); //持续时间3000ms-10000ms
+        entity8090.setDuration20000(eventDipShortDistribution.getFeatureAmp90with20000ms()); //持续时间10000ms-20000ms
+        entity8090.setDuration60000(eventDipShortDistribution.getFeatureAmp90with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity8090);
+
+        //特征幅值[70,80)
+        EventDipShortDistributionTableVO entity7080 = new EventDipShortDistributionTableVO();
+        entity7080.setFeatureAmplitude("[70,80)");
+        entity7080.setDuration100(eventDipShortDistribution.getFeatureAmp80with100ms()); //持续时间10ms-100ms
+        entity7080.setDuration250(eventDipShortDistribution.getFeatureAmp80with250ms()); //持续时间100ms-250ms
+        entity7080.setDuration500(eventDipShortDistribution.getFeatureAmp80with500ms()); //持续时间250ms-500ms
+        entity7080.setDuration1000(eventDipShortDistribution.getFeatureAmp80with1000ms()); //持续时间500ms-1000ms
+        entity7080.setDuration3000(eventDipShortDistribution.getFeatureAmp80with3000ms()); //持续时间1000ms-3000ms
+        entity7080.setDuration10000(eventDipShortDistribution.getFeatureAmp80with10000ms()); //持续时间3000ms-10000ms
+        entity7080.setDuration20000(eventDipShortDistribution.getFeatureAmp80with20000ms()); //持续时间10000ms-20000ms
+        entity7080.setDuration60000(eventDipShortDistribution.getFeatureAmp80with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity7080);
+
+        //特征幅值[60,70)
+        EventDipShortDistributionTableVO entity6070 = new EventDipShortDistributionTableVO();
+        entity6070.setFeatureAmplitude("[60,70)");
+        entity6070.setDuration100(eventDipShortDistribution.getFeatureAmp70with100ms()); //持续时间10ms-100ms
+        entity6070.setDuration250(eventDipShortDistribution.getFeatureAmp70with250ms()); //持续时间100ms-250ms
+        entity6070.setDuration500(eventDipShortDistribution.getFeatureAmp70with500ms()); //持续时间250ms-500ms
+        entity6070.setDuration1000(eventDipShortDistribution.getFeatureAmp70with1000ms()); //持续时间500ms-1000ms
+        entity6070.setDuration3000(eventDipShortDistribution.getFeatureAmp70with3000ms()); //持续时间1000ms-3000ms
+        entity6070.setDuration10000(eventDipShortDistribution.getFeatureAmp70with10000ms()); //持续时间3000ms-10000ms
+        entity6070.setDuration20000(eventDipShortDistribution.getFeatureAmp70with20000ms()); //持续时间10000ms-20000ms
+        entity6070.setDuration60000(eventDipShortDistribution.getFeatureAmp70with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity6070);
+
+        //特征幅值[50,60)
+        EventDipShortDistributionTableVO entity5060 = new EventDipShortDistributionTableVO();
+        entity5060.setFeatureAmplitude("[50,60)");
+        entity5060.setDuration100(eventDipShortDistribution.getFeatureAmp60with100ms()); //持续时间10ms-100ms
+        entity5060.setDuration250(eventDipShortDistribution.getFeatureAmp60with250ms()); //持续时间100ms-250ms
+        entity5060.setDuration500(eventDipShortDistribution.getFeatureAmp60with500ms()); //持续时间250ms-500ms
+        entity5060.setDuration1000(eventDipShortDistribution.getFeatureAmp60with1000ms()); //持续时间500ms-1000ms
+        entity5060.setDuration3000(eventDipShortDistribution.getFeatureAmp60with3000ms()); //持续时间1000ms-3000ms
+        entity5060.setDuration10000(eventDipShortDistribution.getFeatureAmp60with10000ms()); //持续时间3000ms-10000ms
+        entity5060.setDuration20000(eventDipShortDistribution.getFeatureAmp60with20000ms()); //持续时间10000ms-20000ms
+        entity5060.setDuration60000(eventDipShortDistribution.getFeatureAmp60with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity5060);
+
+        //特征幅值[40,50)
+        EventDipShortDistributionTableVO entity4050 = new EventDipShortDistributionTableVO();
+        entity4050.setFeatureAmplitude("[40,50)");
+        entity4050.setDuration100(eventDipShortDistribution.getFeatureAmp50with100ms()); //持续时间10ms-100ms
+        entity4050.setDuration250(eventDipShortDistribution.getFeatureAmp50with250ms()); //持续时间100ms-250ms
+        entity4050.setDuration500(eventDipShortDistribution.getFeatureAmp50with500ms()); //持续时间250ms-500ms
+        entity4050.setDuration1000(eventDipShortDistribution.getFeatureAmp50with1000ms()); //持续时间500ms-1000ms
+        entity4050.setDuration3000(eventDipShortDistribution.getFeatureAmp50with3000ms()); //持续时间1000ms-3000ms
+        entity4050.setDuration10000(eventDipShortDistribution.getFeatureAmp50with10000ms()); //持续时间3000ms-10000ms
+        entity4050.setDuration20000(eventDipShortDistribution.getFeatureAmp50with20000ms()); //持续时间10000ms-20000ms
+        entity4050.setDuration60000(eventDipShortDistribution.getFeatureAmp50with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity4050);
+
+        //特征幅值[30,40)
+        EventDipShortDistributionTableVO entity3040 = new EventDipShortDistributionTableVO();
+        entity3040.setFeatureAmplitude("[30,40)");
+        entity3040.setDuration100(eventDipShortDistribution.getFeatureAmp40with100ms()); //持续时间10ms-100ms
+        entity3040.setDuration250(eventDipShortDistribution.getFeatureAmp40with250ms()); //持续时间100ms-250ms
+        entity3040.setDuration500(eventDipShortDistribution.getFeatureAmp40with500ms()); //持续时间250ms-500ms
+        entity3040.setDuration1000(eventDipShortDistribution.getFeatureAmp40with1000ms()); //持续时间500ms-1000ms
+        entity3040.setDuration3000(eventDipShortDistribution.getFeatureAmp40with3000ms()); //持续时间1000ms-3000ms
+        entity3040.setDuration10000(eventDipShortDistribution.getFeatureAmp40with10000ms()); //持续时间3000ms-10000ms
+        entity3040.setDuration20000(eventDipShortDistribution.getFeatureAmp40with20000ms()); //持续时间10000ms-20000ms
+        entity3040.setDuration60000(eventDipShortDistribution.getFeatureAmp40with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity3040);
+
+        //特征幅值[20,30)
+        EventDipShortDistributionTableVO entity2030 = new EventDipShortDistributionTableVO();
+        entity2030.setFeatureAmplitude("[20,30)");
+        entity2030.setDuration100(eventDipShortDistribution.getFeatureAmp30with100ms()); //持续时间10ms-100ms
+        entity2030.setDuration250(eventDipShortDistribution.getFeatureAmp30with250ms()); //持续时间100ms-250ms
+        entity2030.setDuration500(eventDipShortDistribution.getFeatureAmp30with500ms()); //持续时间250ms-500ms
+        entity2030.setDuration1000(eventDipShortDistribution.getFeatureAmp30with1000ms()); //持续时间500ms-1000ms
+        entity2030.setDuration3000(eventDipShortDistribution.getFeatureAmp30with3000ms()); //持续时间1000ms-3000ms
+        entity2030.setDuration10000(eventDipShortDistribution.getFeatureAmp30with10000ms()); //持续时间3000ms-10000ms
+        entity2030.setDuration20000(eventDipShortDistribution.getFeatureAmp30with20000ms()); //持续时间10000ms-20000ms
+        entity2030.setDuration60000(eventDipShortDistribution.getFeatureAmp30with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity2030);
+
+        //特征幅值[10,20)
+        EventDipShortDistributionTableVO entity1020 = new EventDipShortDistributionTableVO();
+        entity1020.setFeatureAmplitude("[10,20)");
+        entity1020.setDuration100(eventDipShortDistribution.getFeatureAmp20with100ms()); //持续时间10ms-100ms
+        entity1020.setDuration250(eventDipShortDistribution.getFeatureAmp20with250ms()); //持续时间100ms-250ms
+        entity1020.setDuration500(eventDipShortDistribution.getFeatureAmp20with500ms()); //持续时间250ms-500ms
+        entity1020.setDuration1000(eventDipShortDistribution.getFeatureAmp20with1000ms()); //持续时间500ms-1000ms
+        entity1020.setDuration3000(eventDipShortDistribution.getFeatureAmp20with3000ms()); //持续时间1000ms-3000ms
+        entity1020.setDuration10000(eventDipShortDistribution.getFeatureAmp20with10000ms()); //持续时间3000ms-10000ms
+        entity1020.setDuration20000(eventDipShortDistribution.getFeatureAmp20with20000ms()); //持续时间10000ms-20000ms
+        entity1020.setDuration60000(eventDipShortDistribution.getFeatureAmp20with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity1020);
+
+        //特征幅值[0,10)
+        EventDipShortDistributionTableVO entity10 = new EventDipShortDistributionTableVO();
+        entity10.setFeatureAmplitude("[0,10)");
+        entity10.setDuration100(eventDipShortDistribution.getFeatureAmp10with100ms()); //持续时间10ms-100ms
+        entity10.setDuration250(eventDipShortDistribution.getFeatureAmp10with250ms()); //持续时间100ms-250ms
+        entity10.setDuration500(eventDipShortDistribution.getFeatureAmp10with500ms()); //持续时间250ms-500ms
+        entity10.setDuration1000(eventDipShortDistribution.getFeatureAmp10with1000ms()); //持续时间500ms-1000ms
+        entity10.setDuration3000(eventDipShortDistribution.getFeatureAmp10with3000ms()); //持续时间1000ms-3000ms
+        entity10.setDuration10000(eventDipShortDistribution.getFeatureAmp10with10000ms()); //持续时间3000ms-10000ms
+        entity10.setDuration20000(eventDipShortDistribution.getFeatureAmp10with20000ms()); //持续时间10000ms-20000ms
+        entity10.setDuration60000(eventDipShortDistribution.getFeatureAmp10with60000ms()); //持续时间20000ms-60000ms
+        list.add(entity10);
+        return list;
     }
 
+    /***
+     * 暂态指标监测点电压暂升分布情况
+     * @author jianghaifei
+     * @date 2022-10-29 14:08
+     * @param eventMonitorReportParam
+     * @return com.njcn.event.pojo.vo.EventRiseDistributionVO
+     */
     @Override
-    public EventRiseDistributionVO getEventRiseDistributionByCond(EventMonitorReportParam eventMonitorReportParam) {
+    public List<EventRiseDistributionTableVO> getEventRiseDistributionByCond(EventMonitorReportParam eventMonitorReportParam) {
+        //提取参数
+//        String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
+//        String id = eventMonitorReportParam.getId(); //单位id
+        String startTime = eventMonitorReportParam.getStartTime(); //开始时间
+        String endTime = eventMonitorReportParam.getEndTime(); //结束时间
+        Integer type = eventMonitorReportParam.getType(); //时间类型（日/月）
+
+        /****** 获取监测点信息(version1.0) ******/
+//        //获取所有子部门信息
+//        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+//        if (CollUtil.isEmpty(deptDTOList)) {
+//            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+//        }
+//        //单位id集合
+//        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        //查询监测点信息
+//        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
+//        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
+//        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
+//        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
+
+        //查询监测点信息(version2.0)
+        List<PmsMonitorDTO> monitorList = this.getMonitorList(eventMonitorReportParam);
+        List<String> monitorIdList = monitorList.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList()); //监测点id集合
+
+        //获取暂态指标的字典
+        List<DictData> eventStatisList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        //将暂态指标信息转成map，key：code  value：实体
+        Map<String, DictData> eventStatisMapByCode = eventStatisList.stream().collect(Collectors.toMap(DictData::getCode, data -> data));
+        //暂升分布情况
+        Map<String, Object> riseCondMap = new HashMap<>();
+        riseCondMap.put("monitorIdList", monitorIdList);
+        riseCondMap.put("startTime", startTime);
+        riseCondMap.put("endTime", endTime);
+        riseCondMap.put("eventTypeList", Collections.singletonList(eventStatisMapByCode.get(DicDataEnum.VOLTAGE_RISE.getCode()).getId()));
+        riseCondMap.put("dateType", type);
+        EventRiseDistributionVO eventRiseDistribution = eventDistributionStatisticsMapper.getEventRiseDistributionByCond(riseCondMap);
+        //设置返回数据
+        List<EventRiseDistributionTableVO> list = new ArrayList<>();
+        //特征幅值U1≥120
+        EventRiseDistributionTableVO entity120 = new EventRiseDistributionTableVO();
+        entity120.setFeatureAmplitude("≥120");
+        entity120.setDuration500(eventRiseDistribution.getFeatureAmp120with500ms()); //持续时间100ms-500ms
+        entity120.setDuration5000(eventRiseDistribution.getFeatureAmp120with5000ms()); //持续时间500ms-5000ms
+        entity120.setDuration60000(eventRiseDistribution.getFeatureAmp120with60000ms()); //持续时间5000ms-60000ms
+        list.add(entity120);
+
+        //特征幅值-120-110
+        EventRiseDistributionTableVO entity110 = new EventRiseDistributionTableVO();
+        entity110.setFeatureAmplitude("-120,110");
+        entity110.setDuration500(eventRiseDistribution.getFeatureAmp110with500ms()); //持续时间100ms-500ms
+        entity110.setDuration5000(eventRiseDistribution.getFeatureAmp110with5000ms()); //持续时间500ms-5000ms
+        entity110.setDuration60000(eventRiseDistribution.getFeatureAmp110with60000ms()); //持续时间5000ms-60000ms
+        list.add(entity110);
+        return list;
+    }
+
+    /***
+     * 获取单位(及子孙单位)下的监测点信息(抽取的公共方法)
+     * @author jianghaifei
+     * @date 2022-10-29 17:37
+     * @param eventMonitorReportParam
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsMonitorDTO>
+     */
+    private List<PmsMonitorDTO> getMonitorList(EventMonitorReportParam eventMonitorReportParam) {
         //提取参数
         String monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
         String id = eventMonitorReportParam.getId(); //单位id
-        String startTime = eventMonitorReportParam.getStartTime(); //开始时间
-        String endTime = eventMonitorReportParam.getEndTime(); //结束时间
 
         //获取所有子部门信息
         List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
@@ -210,19 +422,7 @@ public class EventMonitorReportServiceImpl implements EventMonitorReportService
         pmsMonitorParam.setMonitorName(monitorName); //监测点名称
         pmsMonitorParam.setOrgIds(orgNoList); //单位ids
         List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
-        List<String> monitorIdList = monitorList.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList()); //监测点id集合
 
-        //获取暂态指标的字典
-        List<DictData> eventStatisList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
-        //将暂态指标信息转成map，key：code  value：实体
-        Map<String, DictData> eventStatisMapByCode = eventStatisList.stream().collect(Collectors.toMap(DictData::getCode, data -> data));
-        //暂升分布情况
-        Map<String, Object> riseCondMap = new HashMap<>();
-        riseCondMap.put("monitorIdList", monitorIdList);
-        riseCondMap.put("startTime", startTime);
-        riseCondMap.put("endTime", endTime);
-        riseCondMap.put("eventTypeList", Collections.singletonList(eventStatisMapByCode.get(DicDataEnum.VOLTAGE_RISE.getCode()).getId()));
-
-        return eventDistributionStatisticsMapper.getEventRiseDistributionByCond(riseCondMap);
+        return monitorList;
     }
 }
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java
index 7697e04f0..672e8f05a 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java
@@ -28,18 +28,18 @@ public class IntegrityIconVO implements Serializable {
      * x轴 统计类型
      */
     @ApiModelProperty("x轴 统计类型")
-    private List<String> type;
+    private String type;
 
     /**
      * y轴 数据
      */
     @ApiModelProperty("初始数据")
-    private List<Double> single;
+    private Double single;
 
     /**
      * y轴 同比环比数据
      */
     @ApiModelProperty("同比环比数据")
-    private List<Double> ratio;
+    private Double ratio;
 
 }
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionSubstationVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionSubstationVO.java
index 16d8e326f..24097cb6e 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionSubstationVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionSubstationVO.java
@@ -35,6 +35,12 @@ public class PollutionSubstationVO {
     @ApiModelProperty("变电站纬度")
     private BigDecimal latitude;
 
+    @ApiModelProperty("变电站纬度")
+    private Integer deviceCount;
+
+    @ApiModelProperty("变电站纬度")
+    private Integer lineCount;
+
     @ApiModelProperty("污区图统计类型")
     private String pollutionStatis;
 
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
index e9f6b1313..cc83118d3 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
@@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 
 /**
  * <p>
@@ -43,5 +42,11 @@ public class RStatOrgVO  {
     private Float averageOverDay;
 
 
+    @Data
+    public static class PwRStatOrgVO extends  RStatOrgVO{
+        @ApiModelProperty(value = "单位id")
+        private String orgNo;
+    }
+
 
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/IntegrityController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/IntegrityController.java
index 972665cb4..90c67e92e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/IntegrityController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/IntegrityController.java
@@ -55,9 +55,9 @@ public class IntegrityController extends BaseController {
     @PostMapping("/getIntegrityIcon")
     @ApiOperation("数据完整性图表")
     @ApiImplicitParam(name = "integrityIconParam", value = "数据完整性参数", required = true)
-    public HttpResult<IntegrityIconVO> getIntegrityIcon(@RequestBody @Validated DeviceInfoParam.CompareBusinessParam integrityIconParam) {
+    public HttpResult<List<IntegrityIconVO>> getIntegrityIcon(@RequestBody @Validated DeviceInfoParam.CompareBusinessParam integrityIconParam) {
         String methodDescribe = getMethodDescribe("getIntegrityIcon");
-        IntegrityIconVO integrityIconVO = integrityService.getIntegrityIcon(integrityIconParam);
+        List<IntegrityIconVO> integrityIconVO = integrityService.getIntegrityIcon(integrityIconParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, integrityIconVO, methodDescribe);
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PwRStatHarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PwRStatHarmonicController.java
deleted file mode 100644
index 07aaaeeb6..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PwRStatHarmonicController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.njcn.harmonic.controller;
-
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.BizParamConstant;
-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.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.service.RStatHarmonicMService;
-import com.njcn.harmonic.service.RStatHarmonicQService;
-import com.njcn.harmonic.service.RStatHarmonicYService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-09
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "配网指标分类概览-监测点分类总览")
-@RequestMapping("/harmonic/PwRStatHarmonic")
-public class PwRStatHarmonicController extends BaseController {
-
-    private final RStatHarmonicMService rStatHarmonicMService;
-    private final RStatHarmonicQService rStatHarmonicQService;
-    private final RStatHarmonicYService rStatHarmonicYService;
-
-    /**
-     * 查询查询监测点稳态指标 日/月点数
-     */
-    @PostMapping("/getPwAllRStatHarmonic")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("查询稳态累计超标监测点数")
-    public HttpResult<List<RArrayVO>> getPwAllRStatHarmonic(@RequestBody StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getPwAllRStatHarmonic");
-        List<RArrayVO> rStatHarmonicMAll = null;
-        String string = param.getType().toString();
-        switch (string) {
-            //查询超标监测点数-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rStatHarmonicMAll = rStatHarmonicYService.getPwRStatHarmonicYAll(param);
-                break;
-            //查询超标监测点数-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rStatHarmonicMAll = rStatHarmonicQService.getPwRStatHarmonicQAll(param);
-                break;
-            //查询超标监测点数-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rStatHarmonicMAll = rStatHarmonicMService.getPwRStatHarmonicMAll(param);
-                break;
-            default:
-                break;
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
-    }
-
-
-    /**
-     * 监测点-频率偏差-电压统计图
-     */
-    @PostMapping("/getPwRStatHarmonicIconDate")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("稳态监测点-频率偏差-越线日期统计图")
-    public HttpResult<List<RHarmonicPolylineVO>> getPwRStatHarmonicIconDate(@RequestBody RStatHarmonicMParam param) {
-        String methodDescribe = getMethodDescribe("getPwRStatHarmonicIconDate");
-        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getPwRStatHarmonicIconDate(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
index 0b05502bf..5dae8c387 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
@@ -7,12 +7,14 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 import com.njcn.harmonic.service.RMpBenchmarkLevelMService;
 import com.njcn.harmonic.service.RMpBenchmarkLevelQService;
 import com.njcn.harmonic.service.RMpBenchmarkLevelYService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,7 +32,7 @@ import java.util.List;
  * @Version V1.0
  */
 @RestController
-@Api(tags = "主网-区域稳态电能质量水平评估")
+@Api(tags = "主配网-基准水平评估")
 @RequiredArgsConstructor
 @RequestMapping("/rMpBenchmarkLevel")
 public class RMpBenchmarkLevelController extends BaseController {
@@ -44,7 +46,7 @@ public class RMpBenchmarkLevelController extends BaseController {
 
     @PostMapping("getAllRMpBenchmarkLevelList")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("查询区域稳态电能质量水平评估")
+    @ApiOperation("主网-区域稳态电能质量水平评估")
     public HttpResult<List<RMpBenchmarkLevelVO>> getAllRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
         String methodDescribe = getMethodDescribe("getAllRMpBenchmarkLevelList");
         //获取查询条件-时间类型
@@ -69,4 +71,32 @@ public class RMpBenchmarkLevelController extends BaseController {
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
     }
+
+    @PostMapping("getPwRMpBenchmarkLevelList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("配网-全网基准水平")
+    public HttpResult<List<PwRMpBenchmarkLevelVO>> getPwRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        String methodDescribe = getMethodDescribe("getPwRMpBenchmarkLevelList");
+        //获取查询条件-时间类型
+        String type = rMpBenchmarkLevelParam.getType().toString();
+        List<PwRMpBenchmarkLevelVO> rMpBenchmarkLevelList;
+        switch (type) {
+            case BizParamConstant.STAT_BIZ_YEAR:
+                //查询基准水平-年数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelYService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                //查询基准水平-季数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_MONTH:
+                //查询基准水平-月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            default:
+                //如果前端没有传type默认查询月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
+    }
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
deleted file mode 100644
index db303d110..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.njcn.harmonic.controller;
-
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.BizParamConstant;
-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.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.vo.*;
-import com.njcn.harmonic.service.*;
-import com.njcn.web.controller.BaseController;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-09
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "主网指标分类概览-监测点分类总览")
-@RequestMapping("/harmonic/rStatHarmonic")
-public class RStatHarmonicMController extends BaseController {
-
-    private final RStatHarmonicMService rStatHarmonicMService;
-    private final RStatHarmonicQService rStatHarmonicQService;
-    private final RStatHarmonicYService rStatHarmonicYService;
-
-    /**
-     * 查询查询监测点稳态指标 日/月点数
-     */
-    @GetMapping("/getAllRStatHarmonic")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("查询稳态累计超标监测点数")
-    public HttpResult<List<RArrayVO>> getAllRStatHarmonic(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatHarmonic");
-        List<RArrayVO> rStatHarmonicMAll = null;
-        String string = param.getType().toString();
-        switch (string) {
-            //查询超标监测点数-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rStatHarmonicMAll = rStatHarmonicYService.getRStatHarmonicYAll(param);
-                break;
-            //查询超标监测点数-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rStatHarmonicMAll = rStatHarmonicQService.getRStatHarmonicQAll(param);
-                break;
-            //查询超标监测点数-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rStatHarmonicMAll = rStatHarmonicMService.getRStatHarmonicMAll(param);
-                break;
-            default:
-                break;
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
-    }
-
-    /**
-     * 电铁-频率偏差-电压统计图
-     */
-    @GetMapping("/getRStatHarmonicIconVoltage")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("稳态电铁-频率偏差-电压统计图")
-    public HttpResult<List<RIconVO>> getRStatHarmonicIconVoltage(RStatHarmonicMParam param) {
-        String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage");
-        List<RIconVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconVoltage(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
-    }
-
-    /**
-     * 电铁-频率偏差-电压统计图
-     */
-    @GetMapping("/getRStatHarmonicIconDate")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("稳态电铁-频率偏差-越线日期统计图")
-    public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIconDate(RStatHarmonicMParam param) {
-        String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
-        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
-    }
-
-
-}
-
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
deleted file mode 100644
index 2754eee41..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.njcn.harmonic.controller;
-
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.BizParamConstant;
-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.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.service.*;
-import com.njcn.web.controller.BaseController;
-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.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "主网指标分类概览-各单位分类总览")
-@RequestMapping("/harmonic/rStatHarmonicOrg")
-public class RStatHarmonicOrgMController extends BaseController {
-
-    private final RStatHarmonicOrgYService rStatHarmonicOrgYService;
-    private final RStatHarmonicOrgQService rStatHarmonicOrgQService;
-    private final RStatHarmonicOrgMService rStatHarmonicOrgMService;
-
-    /**
-     * 查询查询监测点稳态指标 日/月点数
-     */
-    @GetMapping("/getAllRStatHarmonicOrg")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("查询稳态累计超标监测点数")
-    public HttpResult<List<RArrayVO>> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
-        List<RArrayVO> rStatHarmonicOrgMAll = null;
-        String string = param.getType().toString();
-        switch (string) {
-            //查询各单位累计超标监测点数-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getRStatHarmonicYAll(param);
-                break;
-            //查询各单位累计超标监测点数-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rStatHarmonicOrgMAll = rStatHarmonicOrgQService.getRStatHarmonicQAll(param);
-                break;
-            //查询各单位累计超标监测点数-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rStatHarmonicOrgMAll = rStatHarmonicOrgMService.getRStatHarmonicMAll(param);
-                break;
-            default:
-                break;
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
-    }
-
-
-    /**
-     * 查询查询监测点稳态指标 日/月点数
-     */
-    @GetMapping("/getAllRStatHarmonicOrgIcon")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("查询稳态各单位超标监测统计图")
-    public HttpResult<List<RIconVO>> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrgIcon");
-        List<RIconVO> getAllRStatHarmonicOrgIcon = null;
-        String string = param.getType().toString();
-        switch (string) {
-            //查询各单位累计超标监测点数统计图-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getRStatHarmonicOrgYIcon(param);
-                break;
-            //查询各单位累计超标监测点数-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgQService.getRStatHarmonicOrgQIcon(param);
-                break;
-            //查询各单位累计超标监测点数-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgMService.getRStatHarmonicOrgMIcon(param);
-                break;
-            default:
-                break;
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, getAllRStatHarmonicOrgIcon, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
deleted file mode 100644
index 85c67f6cb..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.njcn.harmonic.controller;
-
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.BizParamConstant;
-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;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.vo.*;
-import com.njcn.harmonic.service.*;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.List;
-
-
-/**
- * <p>
- * 区域分类统计月表 前端控制器
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "主网指标-稳态指标")
-@RequestMapping("/harmonic/rStatOrg")
-public class RStatOrgController extends BaseController {
-
-    private final RStatOrgYService rStatOrgYService;
-    private final RStatOrgQService rStatOrgQService;
-    private final RStatOrgMService rStatOrgMService;
-    private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService;
-    private final RStatLoadTypeService rStatLoadTypeService;
-    private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService;
-    private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService;
-    private final RMpPassRateService rMpPassRateService;
-
-
-    /**
-     * 查询区域超标统计
-     */
-    @GetMapping("/getAllRStatHarmonicOrg")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("区域超标统计")
-    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
-        List<RStatOrgVO> rStatHarmonicOrgMAll = null;
-        String string = param.getType().toString();
-        switch (string) {
-            //查询区域超标统计-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rStatHarmonicOrgMAll = rStatOrgYService.getRStatHarmonicYAll(param);
-                break;
-            //查询区域超标统计-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rStatHarmonicOrgMAll = rStatOrgQService.getRStatHarmonicQAll(param);
-                break;
-            //查询各区域超标统计-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rStatHarmonicOrgMAll = rStatOrgMService.getRStatHarmonicMAll(param);
-                break;
-            default:
-                break;
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
-    }
-
-
-    /**
-     * 区域稳态指标超标分类统计表
-     */
-    @GetMapping("/getRStatSubstation")
-    @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);
-    }
-
-    /**
-     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
-     *
-     * @param param
-     * @return
-     */
-    @GetMapping("/getRStatOrgIndex")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("区域稳态指标合格率统计表")
-    public HttpResult<List<RStatOrgIndexVO.RStatOrgIndexInfoVO>> getRStatOrgIndex(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getRStatOrgIndex");
-        List<RStatOrgIndexVO.RStatOrgIndexInfoVO> rStatOrg = rStatOrgYService.getRStatOrgIndex(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
-    }
-
-    /**
-     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
-     *
-     * @param param
-     * @return
-     */
-    @PostMapping("/getRMpPassRateInfo")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("稳态指标合格率明细表")
-    public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param) {
-        String methodDescribe = getMethodDescribe("getRMpPassRateInfo");
-        List<RStatOrgIndexVO> rStatOrg = rMpPassRateService.getRMpPassRateInfo(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
deleted file mode 100644
index 55d467a5a..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.njcn.harmonic.controller;
-
-
-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.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
-import com.njcn.harmonic.service.RStatSubstationMService;
-import com.njcn.harmonic.service.RStatSubstationVoltageMService;
-import com.njcn.web.controller.BaseController;
-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.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "主网指标分类概览-变电站分类总览")
-@RequestMapping("/harmonic/rStatSubstation")
-public class RStatSubstationMController extends BaseController {
-
-    private final RStatSubstationMService rStatSubstationMService;
-    private final RStatSubstationVoltageMService rStatSubstationVoltageMService;
-
-    /**
-     * 变电站稳态指标超标分布（按超标天数）
-     */
-    @GetMapping("/getAllRStatSubstationIconDays")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("变电站稳态指标超标分布（按超标天数）")
-    public HttpResult<RSubstationIconVO> getAllRStatSubstationIconDays(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconDays");
-        RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
-    }
-
-    /**
-     * 变电站稳态指标超标分布（按电压等级）
-     */
-    @GetMapping("/getAllRStatSubstationIconVoltage")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("变电站稳态指标超标分布（按电压等级）")
-    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIconVoltage(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconVoltage");
-        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
-    }
-
-
-    /**
-     * 变电站稳态指标平均超标天数
-     */
-    @GetMapping("/getAllRStatSubstationIconAvgDays")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("变电站稳态指标平均超标天数")
-    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIconAvgDays(StatisticsBizBaseParam param) {
-        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconAvgDays");
-        List<RSubstationIcon2VO> statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
-    }
-}
-
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
index e0c579475..0dd04b094 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Mapper
 * @createDate 2022-10-20 18:38:15
 * @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
index 4e3bfb6e8..fef1e5388 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Mapper
 * @createDate 2022-10-20 18:43:52
 * @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
index d38ffff32..e7e3d568b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Mapper
 * @createDate 2022-10-20 18:45:58
 * @Entity com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
index 976a8b119..d63d1b6ec 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Mapper
 * @createDate 2022-10-20 18:45:36
 * @Entity com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
index c7b4fdbb8..c84e30bdf 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_measure_phase_report_d】的数据库操作Mapper
 * @createDate 2022-10-20 18:20:08
 * @Entity com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java
deleted file mode 100644
index c94da4811..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPartHarmonicDetailDMapper extends BaseMapper<RMpPartHarmonicDetailD> {
-
-    /**
-     * 稳态指标超标明细表-指标趋势图
-     * @param param
-     * @return
-     */
-    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(@Param("param") StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java
deleted file mode 100644
index 51051d966..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPartHarmonicDetailMMapper extends BaseMapper<RMpPartHarmonicDetailM> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java
deleted file mode 100644
index a50fed663..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPassRateM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPassRateMMapper extends BaseMapper<RMpPassRateM> {
-
-    /**
-     * 获取月稳态指标合格率明细表
-     * @param baseParam
-     * @return
-     */
-    List<RStatOrgIndexVO> getMonthPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java
deleted file mode 100644
index 48d1975b9..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPassRateQ;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPassRateQMapper extends BaseMapper<RMpPassRateQ> {
-
-    /**
-     * 获取季稳态指标合格率明细表
-     * @param baseParam
-     * @return
-     */
-    List<RStatOrgIndexVO> getQuarterPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java
deleted file mode 100644
index c45283170..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPassRateY;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPassRateYMapper extends BaseMapper<RMpPassRateY> {
-
-    /**
-     * 获取年稳态指标合格率明细表
-     * @param baseParam
-     * @return
-     */
-    List<RStatOrgIndexVO> getYearPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java
index 04d440a8e..b805d4ae8 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java
@@ -32,7 +32,7 @@ public interface RMpPollutionDPOMapper extends BaseMapper<RMpPollutionDPO> {
             "<foreach item='item' index='index' collection='items' open='(' separator=',' close=')'>",
             "#{item}",
             "</foreach>",
-            "\tand DATE_FORMAT( data_date ,'%Y-%m') =#{searchBeginTime}\n",
+            "\tand DATE_FORMAT( data_date ,'%Y-%m-%d')  like #{searchBeginTime}\n",
             "and pollution_type =#{pollutionType}",
             "GROUP BY\n",
             "    l.line_id",
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java
deleted file mode 100644
index 495de0a14..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpSurplusHarmonicDetailDMapper extends BaseMapper<RMpSurplusHarmonicDetailD> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java
deleted file mode 100644
index 81b88ed28..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpSurplusHarmonicDetailMMapper extends BaseMapper<RMpSurplusHarmonicDetailM> {
-
-    /**
-     * 稳态指标超标明细表
-     * @param param
-     * @return
-     */
-    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java
deleted file mode 100644
index b9989aaaa..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicD;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-public interface RStatHarmonicDMapper extends BaseMapper<RStatHarmonicD> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java
deleted file mode 100644
index 905c69b80..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicM;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-09
- */
-public interface RStatHarmonicMMapper extends BaseMapper<RStatHarmonicM> {
-
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java
deleted file mode 100644
index 68f032f90..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-public interface RStatHarmonicQMapper extends BaseMapper<RStatHarmonicQ> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java
deleted file mode 100644
index 60d596b03..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-10
- */
-public interface RStatHarmonicVoltageDMapper extends BaseMapper<RStatHarmonicVoltageD> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java
deleted file mode 100644
index ad0a48b40..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-10
- */
-public interface RStatHarmonicVoltageMMapper extends BaseMapper<RStatHarmonicVoltageM> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java
deleted file mode 100644
index 173f9bb36..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicY;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-public interface RStatHarmonicYMapper extends BaseMapper<RStatHarmonicY> {
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java
deleted file mode 100644
index 20df48f53..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatLoadTypeM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatLoadTypeMMapper extends BaseMapper<RStatLoadTypeM> {
-
-    /**
-     * 获取月区域暂态指标分类统计表
-     * @param param
-     * @return
-     */
-    List<RStatLoadTypeVO> getMonthStatLoadType(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java
deleted file mode 100644
index 8ef60dd32..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatLoadTypeQ;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatLoadTypeQMapper extends BaseMapper<RStatLoadTypeQ> {
-
-    /**
-     * 获取季区域暂态指标分类统计表
-     * @param param
-     * @return
-     */
-    List<RStatLoadTypeVO> getQuarterStatLoadType(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java
deleted file mode 100644
index fb8112ea0..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatLoadTypeY;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatLoadTypeYMapper extends BaseMapper<RStatLoadTypeY> {
-
-    /**
-     * 获取年区域暂态指标分类统计表
-     * @return
-     */
-    List<RStatLoadTypeVO> getYearStatLoadType(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java
deleted file mode 100644
index 048e54d56..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatOrgBusbarVoltageMMapper extends BaseMapper<RStatOrgBusbarVoltageM> {
-
-    /**
-     * 获取月区域电站母线电压类指标超标计
-     * @param param
-     * @return
-     */
-    List<RStatOrgBusbarVoltageVO> getMstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java
deleted file mode 100644
index f7711c6e9..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatOrgBusbarVoltageQMapper extends BaseMapper<RStatOrgBusbarVoltageQ> {
-
-    /**
-     *  获取季区域电站母线电压类指标超标计
-     * @param param
-     * @return
-     */
-    List<RStatOrgBusbarVoltageVO> getQstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java
deleted file mode 100644
index 702b6e5c1..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatOrgBusbarVoltageYMapper extends BaseMapper<RStatOrgBusbarVoltageY> {
-
-    /**
-     * 获取年区域电站母线电压类指标超标计
-     * @param param
-     * @return
-     */
-    List<RStatOrgBusbarVoltageVO> getYstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java
deleted file mode 100644
index 38553399d..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计月表 Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
-
-    /**
-     * 区域稳态指标超标分类统计表--月表数据
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                            ,@Param("dataType") String dataType);
-
-    /**
-     * 获取月区域稳态指标合格率统计表
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                    ,@Param("dataType") String dataType);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java
deleted file mode 100644
index 231d2898c..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgQ;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计季表 Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
-
-    /**
-     * 区域稳态指标超标分类统计表--年表数据
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                                ,@Param("dataType") String dataType);
-
-    /**
-     * 获取季区域稳态指标合格率统计表
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                            ,@Param("dataType") String dataType);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java
deleted file mode 100644
index 678e96efd..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgY;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计年表 Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
-
-    /**
-     * 区域稳态指标超标分类统计表--年表数据
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
-
-    /**
-     *  获取年区域稳态指标合格率统计表
-     * @param param
-     * @param dataType
-     * @return
-     */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
-                                                ,@Param("dataType") String dataType);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java
deleted file mode 100644
index 4a117373d..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationMMapper extends BaseMapper<RStatSubstationM> {
-
-    /**
-     * 变电站稳态指标超标分布（按超标天数）
-     * @param param
-     * @return
-     */
-    RSubstationIconVO getStatSubstationIconM(@Param("param") StatSubstationBizBaseParam param);
-
-    /**
-     * 变电站稳态指标平均超标天数
-     * @param param
-     * @return
-     */
-    List<RSubstationIcon2VO> getStatSubstationIcon2M(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java
deleted file mode 100644
index fb624d72f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationQ;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationQMapper extends BaseMapper<RStatSubstationQ> {
-
-    /**
-     * 变电站稳态指标超标分布（按超标天数）
-     * @param param
-     * @return
-     */
-    RSubstationIconVO getStatSubstationIconQ(@Param("param") StatSubstationBizBaseParam param);
-
-    /**
-     * 变电站稳态指标平均超标天数
-     * @param param
-     * @return
-     */
-    List<RSubstationIcon2VO> getStatSubstationIcon2Q(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java
deleted file mode 100644
index b5eeddc7f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstationVoltageM> {
-
-    /**
-     * 变电站稳态指标超标分布（按电压等级）
-     * @param param
-     * @return
-     */
-    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param);
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java
deleted file mode 100644
index 25e927eb0..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationY;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationYMapper extends BaseMapper<RStatSubstationY> {
-
-    /**
-     * 变电站稳态指标超标分布（按超标天数）
-     * @param param
-     * @return
-     */
-    RSubstationIconVO getStatSubstationIconY(@Param("param") StatSubstationBizBaseParam param);
-
-
-    /**
-     * 变电站稳态指标平均超标天数
-     * @param param
-     * @return
-     */
-    List<RSubstationIcon2VO> getStatSubstationIcon2Y(@Param("param") StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml
deleted file mode 100644
index 51fb92055..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?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.RMpPartHarmonicDetailDMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="is_harmonic" property="isHarmonic" />
-        <result column="is_freq" property="isFreq" />
-        <result column="freq_times" property="freqTimes" />
-        <result column="is_v_dev_up" property="isVDevUp" />
-        <result column="is_v_dev_low" property="isVDevLow" />
-        <result column="is_v_dev" property="isVDev" />
-        <result column="is_v_thd" property="isVThd" />
-        <result column="v_dev_times" property="vDevTimes" />
-        <result column="is_v" property="isV" />
-        <result column="v_times" property="vTimes" />
-        <result column="is_i" property="isI" />
-        <result column="i_times" property="iTimes" />
-        <result column="is_v_2" property="isV2" />
-        <result column="is_v_3" property="isV3" />
-        <result column="is_v_4" property="isV4" />
-        <result column="is_v_5" property="isV5" />
-        <result column="is_v_6" property="isV6" />
-        <result column="is_v_7" property="isV7" />
-        <result column="is_v_8" property="isV8" />
-        <result column="is_v_9" property="isV9" />
-        <result column="is_v_10" property="isV10" />
-        <result column="is_v_11" property="isV11" />
-        <result column="is_v_12" property="isV12" />
-        <result column="is_v_13" property="isV13" />
-        <result column="is_v_14" property="isV14" />
-        <result column="is_v_15" property="isV15" />
-        <result column="is_v_16" property="isV16" />
-        <result column="is_v_17" property="isV17" />
-        <result column="is_v_18" property="isV18" />
-        <result column="is_v_19" property="isV19" />
-        <result column="is_v_20" property="isV20" />
-        <result column="is_v_21" property="isV21" />
-        <result column="is_v_22" property="isV22" />
-        <result column="is_v_23" property="isV23" />
-        <result column="is_v_24" property="isV24" />
-        <result column="is_v_25" property="isV25" />
-        <result column="is_v_26" property="isV26" />
-        <result column="is_v_27" property="isV27" />
-        <result column="is_v_28" property="isV28" />
-        <result column="is_v_29" property="isV29" />
-        <result column="is_v_30" property="isV30" />
-        <result column="is_v_31" property="isV31" />
-        <result column="is_v_32" property="isV32" />
-        <result column="is_v_33" property="isV33" />
-        <result column="is_v_34" property="isV34" />
-        <result column="is_v_35" property="isV35" />
-        <result column="is_v_36" property="isV36" />
-        <result column="is_v_37" property="isV37" />
-        <result column="is_v_38" property="isV38" />
-        <result column="is_v_39" property="isV39" />
-        <result column="is_v_40" property="isV40" />
-        <result column="is_v_41" property="isV41" />
-        <result column="is_v_42" property="isV42" />
-        <result column="is_v_43" property="isV43" />
-        <result column="is_v_44" property="isV44" />
-        <result column="is_v_45" property="isV45" />
-        <result column="is_v_46" property="isV46" />
-        <result column="is_v_47" property="isV47" />
-        <result column="is_v_48" property="isV48" />
-        <result column="is_v_49" property="isV49" />
-        <result column="is_v_50" property="isV50" />
-        <result column="is_i_2" property="isI2" />
-        <result column="is_i_3" property="isI3" />
-        <result column="is_i_4" property="isI4" />
-        <result column="is_i_5" property="isI5" />
-        <result column="is_i_6" property="isI6" />
-        <result column="is_i_7" property="isI7" />
-        <result column="is_i_8" property="isI8" />
-        <result column="is_i_9" property="isI9" />
-        <result column="is_i_10" property="isI10" />
-        <result column="is_i_11" property="isI11" />
-        <result column="is_i_12" property="isI12" />
-        <result column="is_i_13" property="isI13" />
-        <result column="is_i_14" property="isI14" />
-        <result column="is_i_15" property="isI15" />
-        <result column="is_i_16" property="isI16" />
-        <result column="is_i_17" property="isI17" />
-        <result column="is_i_18" property="isI18" />
-        <result column="is_i_19" property="isI19" />
-        <result column="is_i_20" property="isI20" />
-        <result column="is_i_21" property="isI21" />
-        <result column="is_i_22" property="isI22" />
-        <result column="is_i_23" property="isI23" />
-        <result column="is_i_24" property="isI24" />
-        <result column="is_i_25" property="isI25" />
-        <result column="is_i_26" property="isI26" />
-        <result column="is_i_27" property="isI27" />
-        <result column="is_i_28" property="isI28" />
-        <result column="is_i_29" property="isI29" />
-        <result column="is_i_30" property="isI30" />
-        <result column="is_i_31" property="isI31" />
-        <result column="is_i_32" property="isI32" />
-        <result column="is_i_33" property="isI33" />
-        <result column="is_i_34" property="isI34" />
-        <result column="is_i_35" property="isI35" />
-        <result column="is_i_36" property="isI36" />
-        <result column="is_i_37" property="isI37" />
-        <result column="is_i_38" property="isI38" />
-        <result column="is_i_39" property="isI39" />
-        <result column="is_i_40" property="isI40" />
-        <result column="is_i_41" property="isI41" />
-        <result column="is_i_42" property="isI42" />
-        <result column="is_i_43" property="isI43" />
-        <result column="is_i_44" property="isI44" />
-        <result column="is_i_45" property="isI45" />
-        <result column="is_i_46" property="isI46" />
-        <result column="is_i_47" property="isI47" />
-        <result column="is_i_48" property="isI48" />
-        <result column="is_i_49" property="isI49" />
-        <result column="is_i_50" property="isI50" />
-        <result column="is_unbalance" property="isUnbalance" />
-        <result column="is_i_neg" property="isINeg" />
-        <result column="unbalance_times" property="unbalanceTimes" />
-        <result column="i_neg_times" property="iNegTimes" />
-    </resultMap>
-    <select id="getRMpPartHarmonicDetailIcon"
-            resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO">
-        SELECT
-            rmphd.data_date,
-            rmphd.freq_times,
-            rmphd.v_dev_times,
-            rmphd.v_times,
-            rmphd.i_times,
-            rmphd.unbalance_times,
-            rmphd.i_neg_times,
-            rmshd.flicker_times,
-            rmshd.inuharm_times
-        FROM
-            r_mp_part_harmonic_detail_d rmphd
-        LEFT JOIN r_mp_surplus_harmonic_detail_d rmshd ON rmshd.measurement_point_id = rmphd.measurement_point_id
-            AND rmshd.data_date = rmphd.data_date
-        <where>
-            <if test="param != null and  param.id">
-                AND  rmphd.measurement_point_id = #{param.id}
-            </if>
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND  rmphd.data_date >= #{param.startTime} AND rmshd.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND  rmphd.data_date &lt;= #{param.endTime}  AND  rmshd.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml
deleted file mode 100644
index dca90b662..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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.RMpPartHarmonicDetailMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_over_day" property="measurementOverDay" />
-        <result column="freq_over_day" property="freqOverDay" />
-        <result column="v_dev_up_over_day" property="vDevUpOverDay" />
-        <result column="v_dev_low_over_day" property="vDevLowOverDay" />
-        <result column="v_dev_over_day" property="vDevOverDay" />
-        <result column="v_thd_over_day" property="vThdOverDay" />
-        <result column="v_over_day" property="vOverDay" />
-        <result column="i_over_day" property="iOverDay" />
-        <result column="v_2_over_day" property="v2OverDay" />
-        <result column="v_3_over_day" property="v3OverDay" />
-        <result column="v_4_over_day" property="v4OverDay" />
-        <result column="v_5_over_day" property="v5OverDay" />
-        <result column="v_6_over_day" property="v6OverDay" />
-        <result column="v_7_over_day" property="v7OverDay" />
-        <result column="v_8_over_day" property="v8OverDay" />
-        <result column="v_9_over_day" property="v9OverDay" />
-        <result column="v_10_over_day" property="v10OverDay" />
-        <result column="v_11_over_day" property="v11OverDay" />
-        <result column="v_12_over_day" property="v12OverDay" />
-        <result column="v_13_over_day" property="v13OverDay" />
-        <result column="v_14_over_day" property="v14OverDay" />
-        <result column="v_15_over_day" property="v15OverDay" />
-        <result column="v_16_over_day" property="v16OverDay" />
-        <result column="v_17_over_day" property="v17OverDay" />
-        <result column="v_18_over_day" property="v18OverDay" />
-        <result column="v_19_over_day" property="v19OverDay" />
-        <result column="v_20_over_day" property="v20OverDay" />
-        <result column="v_21_over_day" property="v21OverDay" />
-        <result column="v_22_over_day" property="v22OverDay" />
-        <result column="v_23_over_day" property="v23OverDay" />
-        <result column="v_24_over_day" property="v24OverDay" />
-        <result column="v_25_over_day" property="v25OverDay" />
-        <result column="v_26_over_day" property="v26OverDay" />
-        <result column="v_27_over_day" property="v27OverDay" />
-        <result column="v_28_over_day" property="v28OverDay" />
-        <result column="v_29_over_day" property="v29OverDay" />
-        <result column="v_30_over_day" property="v30OverDay" />
-        <result column="v_31_over_day" property="v31OverDay" />
-        <result column="v_32_over_day" property="v32OverDay" />
-        <result column="v_33_over_day" property="v33OverDay" />
-        <result column="v_34_over_day" property="v34OverDay" />
-        <result column="v_35_over_day" property="v35OverDay" />
-        <result column="v_36_over_day" property="v36OverDay" />
-        <result column="v_37_over_day" property="v37OverDay" />
-        <result column="v_38_over_day" property="v38OverDay" />
-        <result column="v_39_over_day" property="v39OverDay" />
-        <result column="v_40_over_day" property="v40OverDay" />
-        <result column="v_41_over_day" property="v41OverDay" />
-        <result column="v_42_over_day" property="v42OverDay" />
-        <result column="v_43_over_day" property="v43OverDay" />
-        <result column="v_44_over_day" property="v44OverDay" />
-        <result column="v_45_over_day" property="v45OverDay" />
-        <result column="v_46_over_day" property="v46OverDay" />
-        <result column="v_47_over_day" property="v47OverDay" />
-        <result column="v_48_over_day" property="v48OverDay" />
-        <result column="v_49_over_day" property="v49OverDay" />
-        <result column="v_50_over_day" property="v50OverDay" />
-        <result column="i_2_over_day" property="i2OverDay" />
-        <result column="i_3_over_day" property="i3OverDay" />
-        <result column="i_4_over_day" property="i4OverDay" />
-        <result column="i_5_over_day" property="i5OverDay" />
-        <result column="i_6_over_day" property="i6OverDay" />
-        <result column="i_7_over_day" property="i7OverDay" />
-        <result column="i_8_over_day" property="i8OverDay" />
-        <result column="i_9_over_day" property="i9OverDay" />
-        <result column="i_10_over_day" property="i10OverDay" />
-        <result column="i_11_over_day" property="i11OverDay" />
-        <result column="i_12_over_day" property="i12OverDay" />
-        <result column="i_13_over_day" property="i13OverDay" />
-        <result column="i_14_over_day" property="i14OverDay" />
-        <result column="i_15_over_day" property="i15OverDay" />
-        <result column="i_16_over_day" property="i16OverDay" />
-        <result column="i_17_over_day" property="i17OverDay" />
-        <result column="i_18_over_day" property="i18OverDay" />
-        <result column="i_19_over_day" property="i19OverDay" />
-        <result column="i_20_over_day" property="i20OverDay" />
-        <result column="i_21_over_day" property="i21OverDay" />
-        <result column="i_22_over_day" property="i22OverDay" />
-        <result column="i_23_over_day" property="i23OverDay" />
-        <result column="i_24_over_day" property="i24OverDay" />
-        <result column="i_25_over_day" property="i25OverDay" />
-        <result column="i_26_over_day" property="i26OverDay" />
-        <result column="i_27_over_day" property="i27OverDay" />
-        <result column="i_28_over_day" property="i28OverDay" />
-        <result column="i_29_over_day" property="i29OverDay" />
-        <result column="i_30_over_day" property="i30OverDay" />
-        <result column="i_31_over_day" property="i31OverDay" />
-        <result column="i_32_over_day" property="i32OverDay" />
-        <result column="i_33_over_day" property="i33OverDay" />
-        <result column="i_34_over_day" property="i34OverDay" />
-        <result column="i_35_over_day" property="i35OverDay" />
-        <result column="i_36_over_day" property="i36OverDay" />
-        <result column="i_37_over_day" property="i37OverDay" />
-        <result column="i_38_over_day" property="i38OverDay" />
-        <result column="i_39_over_day" property="i39OverDay" />
-        <result column="i_40_over_day" property="i40OverDay" />
-        <result column="i_41_over_day" property="i41OverDay" />
-        <result column="i_42_over_day" property="i42OverDay" />
-        <result column="i_43_over_day" property="i43OverDay" />
-        <result column="i_44_over_day" property="i44OverDay" />
-        <result column="i_45_over_day" property="i45OverDay" />
-        <result column="i_46_over_day" property="i46OverDay" />
-        <result column="i_47_over_day" property="i47OverDay" />
-        <result column="i_48_over_day" property="i48OverDay" />
-        <result column="i_49_over_day" property="i49OverDay" />
-        <result column="i_50_over_day" property="i50OverDay" />
-        <result column="unbalance_over_day" property="unbalanceOverDay" />
-        <result column="i_neg_over_day" property="iNegOverDay" />
-        <result column="i_neg_over_day" property="iNegOverDay" />
-        <result column="i_neg_over_day" property="iNegOverDay" />
-        <result column="i_neg_over_day" property="iNegOverDay" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml
deleted file mode 100644
index 1f787c4a1..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.RMpPassRateMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateM">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-    </resultMap>
-    <select id="getMonthPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
-        SELECT
-            measurement_point_id,
-            data_date,
-            freq_pass_rate,
-            v_dev_pass_rate,
-            flicker_pass_rate
-        FROM
-            r_mp_pass_rate_m
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_point_id 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml
deleted file mode 100644
index 83f16baaa..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.RMpPassRateQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateQ">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-    </resultMap>
-    <select id="getQuarterPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
-        SELECT
-            measurement_point_id,
-            data_date,
-            freq_pass_rate,
-            v_dev_pass_rate,
-            flicker_pass_rate
-        FROM
-            r_mp_pass_rate_q
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_point_id 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml
deleted file mode 100644
index 4a088189f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.RMpPassRateYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateY">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-    </resultMap>
-    <select id="getYearPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
-        SELECT
-            measurement_point_id,
-            data_date,
-            freq_pass_rate,
-            v_dev_pass_rate,
-            flicker_pass_rate
-        FROM
-            r_mp_pass_rate_y
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND measurement_point_id 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml
deleted file mode 100644
index 68830faff..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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.RMpSurplusHarmonicDetailDMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="flicker_times" property="flickerTimes" />
-        <result column="is_flicker" property="isFlicker" />
-        <result column="inuharm_times" property="inuharmTimes" />
-        <result column="is_inuharm" property="isInuharm" />
-        <result column="is_inuharm_1" property="isInuharm1" />
-        <result column="is_inuharm_2" property="isInuharm2" />
-        <result column="is_inuharm_3" property="isInuharm3" />
-        <result column="is_inuharm_4" property="isInuharm4" />
-        <result column="is_inuharm_5" property="isInuharm5" />
-        <result column="is_inuharm_6" property="isInuharm6" />
-        <result column="is_inuharm_7" property="isInuharm7" />
-        <result column="is_inuharm_8" property="isInuharm8" />
-        <result column="is_inuharm_9" property="isInuharm9" />
-        <result column="is_inuharm_10" property="isInuharm10" />
-        <result column="is_inuharm_11" property="isInuharm11" />
-        <result column="is_inuharm_12" property="isInuharm12" />
-        <result column="is_inuharm_13" property="isInuharm13" />
-        <result column="is_inuharm_14" property="isInuharm14" />
-        <result column="is_inuharm_15" property="isInuharm15" />
-        <result column="is_inuharm_16" property="isInuharm16" />
-        <result column="is_inuharm_17" property="isInuharm17" />
-        <result column="is_inuharm_18" property="isInuharm18" />
-        <result column="is_inuharm_19" property="isInuharm19" />
-        <result column="is_inuharm_20" property="isInuharm20" />
-        <result column="is_inuharm_21" property="isInuharm21" />
-        <result column="is_inuharm_22" property="isInuharm22" />
-        <result column="is_inuharm_23" property="isInuharm23" />
-        <result column="is_inuharm_24" property="isInuharm24" />
-        <result column="is_inuharm_25" property="isInuharm25" />
-        <result column="is_inuharm_26" property="isInuharm26" />
-        <result column="is_inuharm_27" property="isInuharm27" />
-        <result column="is_inuharm_28" property="isInuharm28" />
-        <result column="is_inuharm_29" property="isInuharm29" />
-        <result column="is_inuharm_30" property="isInuharm30" />
-        <result column="is_inuharm_31" property="isInuharm31" />
-        <result column="is_inuharm_32" property="isInuharm32" />
-        <result column="is_inuharm_33" property="isInuharm33" />
-        <result column="is_inuharm_34" property="isInuharm34" />
-        <result column="is_inuharm_35" property="isInuharm35" />
-        <result column="is_inuharm_36" property="isInuharm36" />
-        <result column="is_inuharm_37" property="isInuharm37" />
-        <result column="is_inuharm_38" property="isInuharm38" />
-        <result column="is_inuharm_39" property="isInuharm39" />
-        <result column="is_inuharm_40" property="isInuharm40" />
-        <result column="is_inuharm_41" property="isInuharm41" />
-        <result column="is_inuharm_42" property="isInuharm42" />
-        <result column="is_inuharm_43" property="isInuharm43" />
-        <result column="is_inuharm_44" property="isInuharm44" />
-        <result column="is_inuharm_45" property="isInuharm45" />
-        <result column="is_inuharm_46" property="isInuharm46" />
-        <result column="is_inuharm_47" property="isInuharm47" />
-        <result column="is_inuharm_48" property="isInuharm48" />
-        <result column="is_inuharm_49" property="isInuharm49" />
-        <result column="is_inuharm_50" property="isInuharm50" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml
deleted file mode 100644
index 867ddf4b6..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?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.RMpSurplusHarmonicDetailMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM">
-        <id column="measurement_point_id" property="measurementPointId" />
-        <result column="data_date" property="dataDate" />
-        <result column="inuharm_over_day" property="inuharmOverDay" />
-        <result column="inuharm_1_over_day" property="inuharm1OverDay" />
-        <result column="inuharm_2_over_day" property="inuharm2OverDay" />
-        <result column="inuharm_3_over_day" property="inuharm3OverDay" />
-        <result column="inuharm_4_over_day" property="inuharm4OverDay" />
-        <result column="inuharm_5_over_day" property="inuharm5OverDay" />
-        <result column="inuharm_6_over_day" property="inuharm6OverDay" />
-        <result column="inuharm_7_over_day" property="inuharm7OverDay" />
-        <result column="inuharm_8_over_day" property="inuharm8OverDay" />
-        <result column="inuharm_9_over_day" property="inuharm9OverDay" />
-        <result column="inuharm_10_over_day" property="inuharm10OverDay" />
-        <result column="inuharm_11_over_day" property="inuharm11OverDay" />
-        <result column="inuharm_12_over_day" property="inuharm12OverDay" />
-        <result column="inuharm_13_over_day" property="inuharm13OverDay" />
-        <result column="inuharm_14_over_day" property="inuharm14OverDay" />
-        <result column="inuharm_15_over_day" property="inuharm15OverDay" />
-        <result column="inuharm_16_over_day" property="inuharm16OverDay" />
-        <result column="inuharm_17_over_day" property="inuharm17OverDay" />
-        <result column="inuharm_18_over_day" property="inuharm18OverDay" />
-        <result column="inuharm_19_over_day" property="inuharm19OverDay" />
-        <result column="inuharm_20_over_day" property="inuharm20OverDay" />
-        <result column="inuharm_21_over_day" property="inuharm21OverDay" />
-        <result column="inuharm_22_over_day" property="inuharm22OverDay" />
-        <result column="inuharm_23_over_day" property="inuharm23OverDay" />
-        <result column="inuharm_24_over_day" property="inuharm24OverDay" />
-        <result column="inuharm_25_over_day" property="inuharm25OverDay" />
-        <result column="inuharm_26_over_day" property="inuharm26OverDay" />
-        <result column="inuharm_27_over_day" property="inuharm27OverDay" />
-        <result column="inuharm_28_over_day" property="inuharm28OverDay" />
-        <result column="inuharm_29_over_day" property="inuharm29OverDay" />
-        <result column="inuharm_30_over_day" property="inuharm30OverDay" />
-        <result column="inuharm_31_over_day" property="inuharm31OverDay" />
-        <result column="inuharm_32_over_day" property="inuharm32OverDay" />
-        <result column="inuharm_33_over_day" property="inuharm33OverDay" />
-        <result column="inuharm_34_over_day" property="inuharm34OverDay" />
-        <result column="inuharm_35_over_day" property="inuharm35OverDay" />
-        <result column="inuharm_36_over_day" property="inuharm36OverDay" />
-        <result column="inuharm_37_over_day" property="inuharm37OverDay" />
-        <result column="inuharm_38_over_day" property="inuharm38OverDay" />
-        <result column="inuharm_39_over_day" property="inuharm39OverDay" />
-        <result column="inuharm_40_over_day" property="inuharm40OverDay" />
-        <result column="inuharm_41_over_day" property="inuharm41OverDay" />
-        <result column="inuharm_42_over_day" property="inuharm42OverDay" />
-        <result column="inuharm_43_over_day" property="inuharm43OverDay" />
-        <result column="inuharm_44_over_day" property="inuharm44OverDay" />
-        <result column="inuharm_45_over_day" property="inuharm45OverDay" />
-        <result column="inuharm_46_over_day" property="inuharm46OverDay" />
-        <result column="inuharm_47_over_day" property="inuharm47OverDay" />
-        <result column="inuharm_48_over_day" property="inuharm48OverDay" />
-        <result column="inuharm_49_over_day" property="inuharm49OverDay" />
-        <result column="inuharm_50_over_day" property="inuharm50OverDay" />
-        <result column="flicker_over_day" property="flickerOverDay" />
-    </resultMap>
-    <select id="getRMpPartHarmonicDetail" resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO">
-        select
-            rms.measurement_point_id,
-            rmphdm.data_date,
-            rms.inuharm_over_day,
-            rms.inuharm_1_over_day,
-            rms.inuharm_2_over_day,
-            rms.inuharm_3_over_day,
-            rms.inuharm_4_over_day,
-            rms.inuharm_5_over_day,
-            rms.inuharm_6_over_day,
-            rms.inuharm_7_over_day,
-            rms.inuharm_8_over_day,
-            rms.inuharm_9_over_day,
-            rms.inuharm_10_over_day,
-            rms.inuharm_11_over_day,
-            rms.inuharm_12_over_day,
-            rms.inuharm_13_over_day,
-            rms.inuharm_14_over_day,
-            rms.inuharm_15_over_day,
-            rms.inuharm_16_over_day,
-            rms.inuharm_17_over_day,
-            rms.inuharm_18_over_day,
-            rms.inuharm_19_over_day,
-            rms.inuharm_20_over_day,
-            rms.inuharm_21_over_day,
-            rms.inuharm_22_over_day,
-            rms.inuharm_23_over_day,
-            rms.inuharm_24_over_day,
-            rms.flicker_over_day,
-            rmphdm.measurement_point_id,
-            rmphdm.measurement_over_day,
-            rmphdm.freq_over_day,
-            rmphdm.v_dev_up_over_day,
-            rmphdm.v_dev_low_over_day,
-            rmphdm.v_dev_over_day,
-            rmphdm.v_thd_over_day,
-            rmphdm.v_over_day,
-            rmphdm.i_over_day,
-            rmphdm.v_2_over_day,
-            rmphdm.v_3_over_day,
-            rmphdm.v_4_over_day,
-            rmphdm.v_5_over_day,
-            rmphdm.v_6_over_day,
-            rmphdm.v_7_over_day,
-            rmphdm.v_8_over_day,
-            rmphdm.v_9_over_day,
-            rmphdm.v_10_over_day,
-            rmphdm.v_11_over_day,
-            rmphdm.v_12_over_day,
-            rmphdm.v_13_over_day,
-            rmphdm.v_14_over_day,
-            rmphdm.v_15_over_day,
-            rmphdm.v_16_over_day,
-            rmphdm.v_17_over_day,
-            rmphdm.v_18_over_day,
-            rmphdm.v_19_over_day,
-            rmphdm.v_20_over_day,
-            rmphdm.v_21_over_day,
-            rmphdm.v_22_over_day,
-            rmphdm.v_23_over_day,
-            rmphdm.v_24_over_day,
-            rmphdm.v_25_over_day,
-            rmphdm.i_2_over_day,
-            rmphdm.i_3_over_day,
-            rmphdm.i_4_over_day,
-            rmphdm.i_5_over_day,
-            rmphdm.i_6_over_day,
-            rmphdm.i_7_over_day,
-            rmphdm.i_8_over_day,
-            rmphdm.i_9_over_day,
-            rmphdm.i_10_over_day,
-            rmphdm.i_11_over_day,
-            rmphdm.i_12_over_day,
-            rmphdm.i_13_over_day,
-            rmphdm.i_14_over_day,
-            rmphdm.i_15_over_day,
-            rmphdm.i_16_over_day,
-            rmphdm.i_17_over_day,
-            rmphdm.i_18_over_day,
-            rmphdm.i_19_over_day,
-            rmphdm.i_20_over_day,
-            rmphdm.i_21_over_day,
-            rmphdm.i_22_over_day,
-            rmphdm.i_23_over_day,
-            rmphdm.i_24_over_day,
-            rmphdm.i_25_over_day,
-            rmphdm.unbalance_over_day,
-            rmphdm.i_neg_over_day
-        from r_mp_surplus_harmonic_detail_m rms
-        right join r_mp_part_harmonic_detail_m rmphdm on rms.measurement_point_id = rmphdm.measurement_point_id
-        and rms.data_date=rmphdm.data_date
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rmphdm.measurement_point_id 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  rmphdm.data_date >= #{param.startTime} AND rms.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rmphdm.data_date &lt;= #{param.endTime}  AND  rms.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml
deleted file mode 100644
index a06087370..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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.RStatHarmonicDMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicD">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="over_limit_measurement" property="overLimitMeasurement" />
-        <result column="over_limit_measurement_ratio" property="overLimitMeasurementRatio" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml
deleted file mode 100644
index 8a82b2adf..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.RStatHarmonicMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
-        <result column="over_day" property="overDay" />
-        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
-        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml
deleted file mode 100644
index 2c8892e91..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.RStatHarmonicQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicQ">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
-        <result column="average_over_day" property="averageOverDay" />
-        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
-        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml
deleted file mode 100644
index e4a264b2b..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.RStatHarmonicVoltageDMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="voltage_type" property="voltageType" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml
deleted file mode 100644
index 489f0a6da..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.RStatHarmonicVoltageMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="voltage_type" property="voltageType" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
-        <result column="over_day" property="overDay" />
-        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
-        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml
deleted file mode 100644
index 84ff5edb0..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.RStatHarmonicYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicY">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="harmonic_type" property="harmonicType" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
-        <result column="average_over_day" property="averageOverDay" />
-        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
-        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml
deleted file mode 100644
index e16d27e83..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.RStatLoadTypeMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="load_type" property="loadType" />
-        <result column="effective_measurement" property="effectiveMeasurement" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_count" property="vCount" />
-        <result column="i_average" property="iAverage" />
-        <result column="i_count" property="iCount" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_count" property="unbalanceCount" />
-        <result column="i_neg_average" property="iNegAverage" />
-        <result column="i_neg_count" property="iNegCount" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_count" property="flickerCount" />
-    </resultMap>
-    <select id="getMonthStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
-        select
-            org_no,
-            load_type,
-            v_average,
-            v_count/effective_measurement as vAccrued,
-            i_average,
-            i_count/effective_measurement as iAccrued,
-            unbalance_average,
-            unbalance_count/effective_measurement as unbalanceAccrued,
-            i_neg_average,
-            i_neg_count/effective_measurement as iNegAccrued,
-            flicker_average,
-            flicker_count/effective_measurement as flickerAccrued
-        from
-            r_stat_load_type_m
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND org_no 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml
deleted file mode 100644
index 01c1743bb..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.RStatLoadTypeQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeQ">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="load_type" property="loadType" />
-        <result column="effective_measurement" property="effectiveMeasurement" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_count" property="vCount" />
-        <result column="i_average" property="iAverage" />
-        <result column="i_count" property="iCount" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_count" property="unbalanceCount" />
-        <result column="i_neg_average" property="iNegAverage" />
-        <result column="i_neg_count" property="iNegCount" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_count" property="flickerCount" />
-    </resultMap>
-    <select id="getQuarterStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
-        select
-            org_no,
-            load_type,
-            v_average,
-            v_count/effective_measurement as vAccrued,
-            i_average,
-            i_count/effective_measurement as iAccrued,
-            unbalance_average,
-            unbalance_count/effective_measurement as unbalanceAccrued,
-            i_neg_average,
-            i_neg_count/effective_measurement as iNegAccrued,
-            flicker_average,
-            flicker_count/effective_measurement as flickerAccrued
-        from
-            r_stat_load_type_q
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND org_no 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml
deleted file mode 100644
index 1ae5791d0..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.RStatLoadTypeYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeY">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="load_type" property="loadType" />
-        <result column="effective_measurement" property="effectiveMeasurement" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_count" property="vCount" />
-        <result column="i_average" property="iAverage" />
-        <result column="i_count" property="iCount" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_count" property="unbalanceCount" />
-        <result column="i_neg_average" property="iNegAverage" />
-        <result column="i_neg_count" property="iNegCount" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_count" property="flickerCount" />
-    </resultMap>
-    <select id="getYearStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
-        select
-            org_no,
-            load_type,
-            v_average,
-            v_count/effective_measurement as vAccrued,
-            i_average,
-            i_count/effective_measurement as iAccrued,
-            unbalance_average,
-            unbalance_count/effective_measurement as unbalanceAccrued,
-            i_neg_average,
-            i_neg_count/effective_measurement as iNegAccrued,
-            flicker_average,
-            flicker_count/effective_measurement as flickerAccrued
-        from
-            r_stat_load_type_y
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND org_no 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>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml
deleted file mode 100644
index 1a44227ce..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.RStatOrgBusbarVoltageMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="busbar_id" property="busbarId" />
-        <result column="measurement_count" property="measurementCount" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_accrued" property="vAccrued" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_accrued" property="unbalanceAccrued" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_accrued" property="flickerAccrued" />
-    </resultMap>
-    <select id="getMstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
-        SELECT
-            thisOrg.org_no,
-            thisOrg.data_date,
-            thisOrg.busbar_id,
-            thisOrg.measurement_count,
-            thisOrg.v_average as average,
-            thisOrg.v_accrued as accrued,
-            thisOrg.unbalance_average,
-            thisOrg.unbalance_accrued,
-            thisOrg.flicker_average,
-            thisOrg.flicker_accrued,
-            lastOrg.v_average as averageSame,
-            lastOrg.v_accrued as accruedSame,
-            lastOrg.unbalance_average as unbalanceAverageSame,
-            lastOrg.unbalance_accrued as unbalanceAccruedSame,
-            lastOrg.flicker_average as flickerAverageSame,
-            lastOrg.flicker_accrued as flickerAccruedSame
-        FROM
-            r_stat_org_busbar_voltage_m thisOrg
-        LEFt JOIN r_stat_org_busbar_voltage_m lastOrg on  thisOrg.org_no=lastOrg.org_no and thisOrg.busbar_id=lastOrg.busbar_id
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (lastOrg.data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (lastOrg.data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND thisOrg.org_no 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  thisOrg.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND  thisOrg.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml
deleted file mode 100644
index c71019a83..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.RStatOrgBusbarVoltageQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="busbar_id" property="busbarId" />
-        <result column="measurement_count" property="measurementCount" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_accrued" property="vAccrued" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_accrued" property="unbalanceAccrued" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_accrued" property="flickerAccrued" />
-    </resultMap>
-    <select id="getQstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
-        SELECT
-            thisOrg.org_no,
-            thisOrg.data_date,
-            thisOrg.busbar_id,
-            thisOrg.measurement_count,
-            thisOrg.v_average as average,
-            thisOrg.v_accrued as accrued,
-            thisOrg.unbalance_average,
-            thisOrg.unbalance_accrued,
-            thisOrg.flicker_average,
-            thisOrg.flicker_accrued,
-            lastOrg.v_average as averageSame,
-            lastOrg.v_accrued as accruedSame,
-            lastOrg.unbalance_average as unbalanceAverageSame,
-            lastOrg.unbalance_accrued as unbalanceAccruedSame,
-            lastOrg.flicker_average as flickerAverageSame,
-            lastOrg.flicker_accrued as flickerAccruedSame
-        FROM
-            r_stat_org_busbar_voltage_q thisOrg
-        LEFt JOIN r_stat_org_busbar_voltage_q lastOrg on  thisOrg.org_no=lastOrg.org_no and thisOrg.busbar_id=lastOrg.busbar_id
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (lastOrg.data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (lastOrg.data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND thisOrg.org_no 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  thisOrg.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND  thisOrg.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml
deleted file mode 100644
index 8f6087f13..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.RStatOrgBusbarVoltageYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="busbar_id" property="busbarId" />
-        <result column="measurement_count" property="measurementCount" />
-        <result column="v_average" property="vAverage" />
-        <result column="v_accrued" property="vAccrued" />
-        <result column="unbalance_average" property="unbalanceAverage" />
-        <result column="unbalance_accrued" property="unbalanceAccrued" />
-        <result column="flicker_average" property="flickerAverage" />
-        <result column="flicker_accrued" property="flickerAccrued" />
-    </resultMap>
-    <select id="getYstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
-        SELECT
-	        thisOrg.org_no,
-            thisOrg.data_date,
-            thisOrg.busbar_id,
-            thisOrg.measurement_count,
-            thisOrg.v_average as average,
-            thisOrg.v_accrued as accrued,
-            thisOrg.unbalance_average,
-            thisOrg.unbalance_accrued,
-            thisOrg.flicker_average,
-            thisOrg.flicker_accrued,
-            lastOrg.v_average as averageSame,
-            lastOrg.v_accrued as accruedSame,
-            lastOrg.unbalance_average as unbalanceAverageSame,
-            lastOrg.unbalance_accrued as unbalanceAccruedSame,
-            lastOrg.flicker_average as flickerAverageSame,
-            lastOrg.flicker_accrued as flickerAccruedSame
-        FROM
-            r_stat_org_busbar_voltage_y thisOrg
-        LEFt JOIN r_stat_org_busbar_voltage_y lastOrg on  thisOrg.org_no=lastOrg.org_no and thisOrg.busbar_id=lastOrg.busbar_id
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (lastOrg.data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (lastOrg.data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND thisOrg.org_no 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  thisOrg.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND  thisOrg.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml
deleted file mode 100644
index c7b0aa3c8..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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.RStatOrgMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="all_count" property="allCount" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
-        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
-        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
-        <result column="over_day_accrued" property="overDayAccrued" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-        <result column="event_measurement_average" property="eventMeasurementAverage" />
-        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
-        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="event_count" property="eventCount" />
-        <result column="should_count" property="shouldCount" />
-        <result column="warn_count" property="warnCount" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-    <select id="getMonthRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
-        SELECT
-           	rso.org_no AS orgNo,
-            rso.data_date AS dataDate,
-            rso.effective_measurement_average AS effectiveMeasurementAverage,
-            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
-            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
-            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
-            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
-            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
-            c.harmonic_type,
-            c.over_limit_measurement_average,
-            c.over_limit_measurement_accrued,
-            c.over_limit_measurement_ratio_average,
-            c.over_limit_measurement_ratio_accrued,
-        (
-                SELECT
-                    over_limit_measurement_average
-                FROM
-                    r_stat_harmonic_org_m a
-                WHERE
-                    a.org_no=c.org_no and
-                    a.harmonic_type=c.harmonic_type
-                <if test="param!=null and param.startTime != null and param.startTime !=''">
-                    AND (data_date >= date(
-                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-                </if>
-                <if test="param!=null and param.endTime != null and param.endTime !=''">
-                    AND (data_date &lt;= date(
-                    DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-                </if>
-
-        ) chainAverage ,
-        (
-                SELECT
-                    over_limit_measurement_accrued
-                FROM
-                    r_stat_harmonic_org_m a
-                WHERE
-                    a.org_no=c.org_no and
-                    a.harmonic_type=c.harmonic_type
-                    <if test="param!=null and param.startTime != null and param.startTime !=''">
-                        AND (data_date >= date(
-                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-                    </if>
-                    <if test="param!=null and param.endTime != null and param.endTime !=''">
-                        AND (data_date &lt;= date(
-                        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-                    </if>
-        ) chainAccrued ,
-        (
-                SELECT
-                    over_limit_measurement_accrued
-                FROM
-                    r_stat_harmonic_org_m a
-                WHERE
-                    a.org_no=c.org_no and
-                    a.harmonic_type=c.harmonic_type
-                    <if test="param!=null and param.startTime != null and param.startTime !=''">
-                        AND (data_date >= date(
-                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
-                    </if>
-                    <if test="param!=null and param.endTime != null and param.endTime !=''">
-                        AND (data_date &lt;= date(
-                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
-                    </if>
-        ) sameAverage,
-        (
-                SELECT
-                    over_limit_measurement_accrued
-                FROM
-                    r_stat_harmonic_org_m a
-                WHERE
-                    a.org_no=c.org_no and
-                    a.harmonic_type=c.harmonic_type
-                    <if test="param!=null and param.startTime != null and param.startTime !=''">
-                        AND (data_date >= date(
-                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
-                    </if>
-                    <if test="param!=null and param.endTime != null and param.endTime !=''">
-                        AND (data_date &lt;= date(
-                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
-                    </if>
-
-        ) sameAccrued ,
-        TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay
-        FROM
-        r_stat_harmonic_org_m c
-        RIGHT JOIN r_stat_org_m AS rso ON rso.org_no = c.org_no
-        <where>
-            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-    </select>
-    <select id="getMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
-        select
-            rso.org_no,
-            rso.effective_measurement_accrued as allCount,
-            rso.freq_pass_rate,
-            ry.freq_pass_rate as freqPassRateYear,
-            rso.v_dev_pass_rate,
-            ry.v_dev_pass_rate as vDevPassRateYear,
-            rso.flicker_pass_rate,
-            ry.flicker_pass_rate as flickerPassRateYear
-        from
-            r_stat_org_m rso
-        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
-        <where>
-            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml
deleted file mode 100644
index 21a65cdfe..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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.RStatOrgQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgQ">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="all_count" property="allCount" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
-        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
-        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
-        <result column="average_over_day" property="averageOverDay" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-        <result column="event_measurement_average" property="eventMeasurementAverage" />
-        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
-        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="event_count" property="eventCount" />
-        <result column="should_count" property="shouldCount" />
-        <result column="warn_count" property="warnCount" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-    <select id="getQuarterRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
-        SELECT
-            rso.org_no AS orgNo,
-            rso.data_date AS dataDate,
-            rso.effective_measurement_average AS effectiveMeasurementAverage,
-            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
-            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
-            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
-            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
-            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
-            c.harmonic_type,
-            c.over_limit_measurement_average,
-            c.over_limit_measurement_accrued,
-            c.over_limit_measurement_ratio_average,
-            c.over_limit_measurement_ratio_accrued,
-        (
-            SELECT
-            over_limit_measurement_average
-            FROM
-            r_stat_harmonic_org_q a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-
-        ) chainAverage ,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_q a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        ) chainAccrued ,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_q a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
-            </if>
-        ) sameAverage,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_q a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
-            </if>
-
-        ) sameAccrued,
-        c.average_over_day
-        FROM
-            r_stat_harmonic_org_q c
-        RIGHT JOIN r_stat_org_q AS rso ON rso.org_no = c.org_no
-        <where>
-            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-    </select>
-    <select id="getQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
-        select
-            rso.org_no,
-            rso.effective_measurement_accrued as allCount,
-            rso.freq_pass_rate,
-            ry.freq_pass_rate as freqPassRateYear,
-            rso.v_dev_pass_rate,
-            ry.v_dev_pass_rate as vDevPassRateYear,
-            rso.flicker_pass_rate,
-            ry.flicker_pass_rate as flickerPassRateYear
-        from
-             r_stat_org_q rso
-        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
-        <where>
-            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND  rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml
deleted file mode 100644
index 3b6bec94d..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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.RStatOrgYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgY">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="measurement_type_class" property="measurementTypeClass" />
-        <result column="all_count" property="allCount" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
-        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
-        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
-        <result column="average_over_day" property="averageOverDay" />
-        <result column="freq_pass_rate" property="freqPassRate" />
-        <result column="v_dev_pass_rate" property="vDevPassRate" />
-        <result column="flicker_pass_rate" property="flickerPassRate" />
-        <result column="event_measurement_average" property="eventMeasurementAverage" />
-        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
-        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="event_count" property="eventCount" />
-        <result column="should_count" property="shouldCount" />
-        <result column="warn_count" property="warnCount" />
-        <result column="data_type" property="dataType" />
-    </resultMap>
-    <select id="getYearRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
-        SELECT
-            rso.org_no AS orgNo,
-            rso.data_date AS dataDate,
-            rso.effective_measurement_average AS effectiveMeasurementAverage,
-            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
-            rso.over_limit_measurement_average AS harmonicMeasurementAverage,
-            rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued,
-            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
-            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
-            c.harmonic_type,
-            c.over_limit_measurement_average,
-            c.over_limit_measurement_accrued,
-            c.over_limit_measurement_ratio_average,
-            c.over_limit_measurement_ratio_accrued,
-        (
-            SELECT
-            over_limit_measurement_average
-            FROM
-            r_stat_harmonic_org_y a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-
-        ) chainAverage ,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_y a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        ) chainAccrued ,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_y a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-        ) sameAverage,
-        (
-            SELECT
-            over_limit_measurement_accrued
-            FROM
-            r_stat_harmonic_org_y a
-            WHERE
-            a.org_no=c.org_no and
-            a.harmonic_type=c.harmonic_type
-            <if test="param!=null and param.startTime != null and param.startTime !=''">
-                AND (data_date >= date(
-                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime !=''">
-                AND (data_date &lt;= date(
-                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
-            </if>
-
-        ) sameAccrued,
-        c.average_over_day
-        FROM
-            r_stat_harmonic_org_y c
-        RIGHT JOIN r_stat_org_y AS rso ON rso.org_no = c.org_no
-        <where>
-                c.data_Type=#{dataType} and rso.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime} and c.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rso.data_date &lt;= #{param.endTime} and c.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-
-    </select>
-    <select id="getYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
-        select
-            org_no,
-            effective_measurement_accrued as allCount,
-            freq_pass_rate,
-            freq_pass_rate as freqPassRateYear,
-            v_dev_pass_rate,
-            v_dev_pass_rate as vDevPassRateYear,
-            flicker_pass_rate,
-            flicker_pass_rate as flickerPassRateYear
-        from
-            r_stat_org_y rso
-        <where>
-            and rso.data_Type=#{dataType}
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND rso.org_no 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  rso.data_date >= #{param.startTime}
-            </if>
-            <if test="param!=null and param.endTime != null and param.endTime != ''">
-                AND   rso.data_date &lt;= #{param.endTime}
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml
deleted file mode 100644
index f85c3830a..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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.RStatSubstationMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationM">
-        <id column="data_date" property="dataDate" />
-        <result column="substation_id" property="substationId" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="harmonic_over_day" property="harmonicOverDay" />
-        <result column="harmonic_count" property="harmonicCount" />
-        <result column="freq_over_day" property="freqOverDay" />
-        <result column="freq_count" property="freqCount" />
-        <result column="v_dev_over_day" property="vDevOverDay" />
-        <result column="v_dev_count" property="vDevCount" />
-        <result column="v_over_day" property="vOverDay" />
-        <result column="v_count" property="vCount" />
-        <result column="i_over_day" property="iOverDay" />
-        <result column="i_count" property="iCount" />
-        <result column="unbalance_over_day" property="unbalanceOverDay" />
-        <result column="unbalance_count" property="unbalanceCount" />
-        <result column="i_neg_over_day" property="iNegOverDay" />
-        <result column="i_neg_count" property="iNegCount" />
-        <result column="flicker_over_day" property="flickerOverDay" />
-        <result column="flicker_count" property="flickerCount" />
-        <result column="inuharm_over_day" property="inuharmOverDay" />
-        <result column="inuharm_count" property="inuharmCount" />
-        <result column="event_count" property="eventCount" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="sag_count" property="sagCount" />
-        <result column="sag_freq" property="sagFreq" />
-        <result column="swell_count" property="swellCount" />
-        <result column="swell_freq" property="swellFreq" />
-        <result column="interrupt_count" property="interruptCount" />
-        <result column="interrupt_freq" property="interruptFreq" />
-    </resultMap>
-    <select id="getStatSubstationIconM" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
-        SELECT
-            COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
-        FROM
-            (
-                SELECT
-                        substation_id,
-                        harmonic_over_day
-                FROM
-                        r_stat_substation_m
-                        <where>
-                            <if test="param != null and param.ids != null and param.ids.size > 0">
-                                AND substation_id 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  #{param.endTime}>= data_date
-                            </if>
-                        </where>
-            ) X
-    </select>
-    <select id="getStatSubstationIcon2M" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
-        SELECT
-            substation_id,
-            effective_measurement_accrued,
-            freq_over_day / freq_count as 'freqAverageOverDay',
-            v_dev_over_day / v_dev_count as 'vDevAverageOverDay',
-            v_over_day / v_count as 'vAverageOverDay',
-            i_over_day / i_count as 'iAverageOverDay',
-            unbalance_over_day / unbalance_count as 'unbalanceAverageOverDay',
-            i_neg_over_day / i_neg_count as 'iNegAverageOverDay',
-            flicker_over_day / flicker_count as 'flickerAverageOverDay',
-            inuharm_over_day / inuharm_count as 'inuharmAverageOverDay'
-        FROM
-            r_stat_substation_m
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND substation_id 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 #{param.endTime}>= data_date
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml
deleted file mode 100644
index 42f5e7765..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.RStatSubstationQMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationQ">
-        <id column="data_date" property="dataDate" />
-        <result column="substation_id" property="substationId" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="harmonic_average_over_day" property="harmonicAverageOverDay" />
-        <result column="freq_average_over_day" property="freqAverageOverDay" />
-        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
-        <result column="v_average_over_day" property="vAverageOverDay" />
-        <result column="i_average_over_day" property="iAverageOverDay" />
-        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
-        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
-        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
-        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
-        <result column="event_count" property="eventCount" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="sag_count" property="sagCount" />
-        <result column="sag_freq" property="sagFreq" />
-        <result column="swell_count" property="swellCount" />
-        <result column="swell_freq" property="swellFreq" />
-        <result column="interrupt_count" property="interruptCount" />
-        <result column="interrupt_freq" property="interruptFreq" />
-    </resultMap>
-    <select id="getStatSubstationIconQ" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
-        SELECT
-            COALESCE( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
-            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
-            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
-        FROM
-        (
-                    SELECT
-                        substation_id,
-                        harmonic_average_over_day
-                    FROM
-                        r_stat_substation_q
-                <where>
-                    <if test="param != null and  param.ids != null and param.ids.size > 0">
-                        AND substation_id 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 #{param.endTime}>= data_date
-                    </if>
-                </where>
-
-        ) X
-
-    </select>
-    <select id="getStatSubstationIcon2Q" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
-        SELECT
-            substation_id,
-            effective_measurement_accrued,
-            freq_average_over_day,
-            v_dev_average_over_day,
-            v_average_over_day,
-            i_average_over_day,
-            unbalance_average_over_day,
-            i_neg_average_over_day,
-            flicker_average_over_day,
-            inuharm_average_over_day
-        FROM
-            r_stat_substation_q
-        <where>
-            <if test="param != null and  param.ids != null and param.ids.size > 0">
-                AND substation_id 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 #{param.endTime}>= data_date
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml
deleted file mode 100644
index b53c75846..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.RStatSubstationVoltageMMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationVoltageM">
-        <id column="org_no" property="orgNo" />
-        <result column="data_date" property="dataDate" />
-        <result column="substation_voltage" property="substationVoltage" />
-        <result column="substation_count" property="substationCount" />
-        <result column="harmonic_count" property="harmonicCount" />
-        <result column="event_count" property="eventCount" />
-    </resultMap>
-    <select id="getStatSubstationIcon" resultType="com.njcn.harmonic.pojo.vo.RVoltageIconVO">
-        SELECT
-        substation_voltage as 'substationVoltage',
-        sum( substation_count ) as 'substationCount',
-        sum( harmonic_count ) as 'harmonicCount'
-        FROM
-        r_stat_substation_voltage_m
-        <where>
-            <if test="param != null and param.ids != null and param.ids.size > 0">
-                AND org_no 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  #{param.endTime} >= data_date
-            </if>
-        </where>
-        GROUP BY substation_voltage
-    </select>
-
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml
deleted file mode 100644
index 4c1121da5..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.RStatSubstationYMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationY">
-        <id column="data_date" property="dataDate" />
-        <result column="substation_id" property="substationId" />
-        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
-        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
-        <result column="harmonic_over_day" property="harmonicOverDay" />
-        <result column="freq_average_over_day" property="freqAverageOverDay" />
-        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
-        <result column="v_average_over_day" property="vAverageOverDay" />
-        <result column="i_average_over_day" property="iAverageOverDay" />
-        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
-        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
-        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
-        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
-        <result column="event_count" property="eventCount" />
-        <result column="event_freq" property="eventFreq" />
-        <result column="sag_count" property="sagCount" />
-        <result column="sag_freq" property="sagFreq" />
-        <result column="swell_count" property="swellCount" />
-        <result column="swell_freq" property="swellFreq" />
-        <result column="interrupt_count" property="interruptCount" />
-        <result column="interrupt_freq" property="interruptFreq" />
-    </resultMap>
-    <select id="getStatSubstationIconY" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
-        SELECT
-                COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
-                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
-                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
-        FROM
-        (
-                    SELECT
-                        substation_id,
-                        harmonic_over_day
-                    FROM
-                         r_stat_substation_y
-                    <where>
-                        <if test="param != null and param.ids != null and param.ids.size > 0">
-                            AND substation_id 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  #{param.endTime}>= data_date
-                        </if>
-                    </where>
-
-        ) X
-
-    </select>
-    <select id="getStatSubstationIcon2Y" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
-        SELECT
-            substation_id,
-            effective_measurement_accrued,
-            freq_average_over_day,
-            v_dev_average_over_day,
-            v_average_over_day,
-            i_average_over_day,
-            unbalance_average_over_day,
-            i_neg_average_over_day,
-            flicker_average_over_day,
-            inuharm_average_over_day
-        FROM
-            r_stat_substation_y
-        <where>
-            <if test="param != null and param.ids != null and param.ids.size > 0">
-                AND substation_id 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  #{param.endTime}>= data_date
-            </if>
-        </where>
-    </select>
-
-</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IntegrityService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IntegrityService.java
index a7d727bca..0b4fa4477 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IntegrityService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IntegrityService.java
@@ -33,7 +33,7 @@ public interface IntegrityService {
      * @author xy
      * @date 2022/1/4 9:27
      */
-    IntegrityIconVO getIntegrityIcon(DeviceInfoParam.CompareBusinessParam integrityIconParam);
+    List<IntegrityIconVO> getIntegrityIcon(DeviceInfoParam.CompareBusinessParam integrityIconParam);
 
     /**
      * excel0报表导出数据完整性
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
index 9921cd9c2..853d6bfc5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
@@ -3,6 +3,7 @@ package com.njcn.harmonic.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 
 import java.util.List;
@@ -22,4 +23,13 @@ public interface RMpBenchmarkLevelMService extends IService<RMpBenchmarkLevelM>
      * @return java.util.List<com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM>
      */
     List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+
+    /***
+     * 配网-全网基准水平
+     * @author jianghaifei
+     * @date 2022-11-04 10:30
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
+    List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
index b2d95f482..ce3fce41d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
@@ -3,6 +3,7 @@ package com.njcn.harmonic.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 
 import java.util.List;
@@ -14,5 +15,21 @@ import java.util.List;
 */
 public interface RMpBenchmarkLevelQService extends IService<RMpBenchmarkLevelQ> {
 
+    /***
+     * 主网-区域稳态电能质量水平评估
+     * @author jianghaifei
+     * @date 2022-11-04 10:30
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
     List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+
+    /***
+     * 配网-全网基准水平
+     * @author jianghaifei
+     * @date 2022-11-04 10:31
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
+    List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
index 944e64cb4..0e776bd1c 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
@@ -3,6 +3,7 @@ package com.njcn.harmonic.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 
 import java.util.List;
@@ -14,5 +15,21 @@ import java.util.List;
 */
 public interface RMpBenchmarkLevelYService extends IService<RMpBenchmarkLevelY> {
 
+    /***
+     * 主网-区域稳态电能质量水平评估
+     * @author jianghaifei
+     * @date 2022-11-04 10:30
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
     List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+
+    /***
+     * 配网-全网基准水平
+     * @author jianghaifei
+     * @date 2022-11-04 10:30
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
+    List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
index 31610da31..d6032b6db 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Service
 * @createDate 2022-10-20 18:38:15
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
index 52ae3ca8a..50675518e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Service
 * @createDate 2022-10-20 18:43:52
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
index 35187b653..841d44a00 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Service
 * @createDate 2022-10-20 18:45:58
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
index 781529df6..72d1d9095 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Service
 * @createDate 2022-10-20 18:45:36
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
index a0a6d9f32..b35458786 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_measure_phase_report_d】的数据库操作Service
 * @createDate 2022-10-20 18:20:08
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java
deleted file mode 100644
index fd2abeee4..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPartHarmonicDetailDService extends IService<RMpPartHarmonicDetailD> {
-
-    /**
-     * 稳态指标超标明细表-指标趋势图
-     *
-     * @param param
-     * @return
-     */
-    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java
deleted file mode 100644
index ffa31f496..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.harmonic.service;
-
-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.RMpPartHarmonicDetailM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPartHarmonicDetailMService extends IService<RMpPartHarmonicDetailM> {
-
-    /**
-     * 稳态指标超标明细表
-     *
-     * @param param
-     * @return
-     */
-    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(RStatOrgParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java
deleted file mode 100644
index a21ae73ac..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.harmonic.service;
-
-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.RMpPassRateQ;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-public interface RMpPassRateService extends IService<RMpPassRateQ> {
-
-    /**
-     * 稳态指标合格率明细表
-     *
-     * @param param
-     * @return
-     */
-    List<RStatOrgIndexVO> getRMpPassRateInfo(RStatOrgParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java
deleted file mode 100644
index 9e44c83eb..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicM;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-09
- */
-public interface RStatHarmonicMService extends IService<RStatHarmonicM> {
-
-    /**
-     * 主网查询查询监测点稳态指标 日/月点数
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
-
-    /**
-     * 主网稳态电铁-频率偏差-电压统计图
-     * @param param
-     * @return
-     */
-    List<RIconVO> getRStatHarmonicIconVoltage(RStatHarmonicMParam param);
-
-    /**
-     * 主网稳态电铁-频率偏差-越线日期统计图
-     * @param param
-     * @return
-     */
-    List<RHarmonicPolylineVO> getRStatHarmonicIconDate(RStatHarmonicMParam param);
-
-    /**
-     * 配网查询监测点稳态指标（月）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getPwRStatHarmonicMAll(StatisticsBizBaseParam param);
-
-    /**
-     * 配网监测点-频率偏差-越线日期统计图
-     * @param param
-     * @return
-     */
-    List<RHarmonicPolylineVO> getPwRStatHarmonicIconDate(RStatHarmonicMParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java
deleted file mode 100644
index 24f13696c..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-public interface RStatHarmonicOrgMService extends IService<RStatHarmonicOrgM> {
-
-    /**
-     * 查询查询各单位稳态指标 日/月点数（月）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
-
-    /**
-     * 查询各单位累计超标监测点数统计图-月数据
-     * @param param
-     * @return
-     */
-    List<RIconVO> getRStatHarmonicOrgMIcon(RStatHarmonicMParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java
deleted file mode 100644
index ae38d9820..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-public interface RStatHarmonicOrgQService extends IService<RStatHarmonicOrgQ> {
-
-    /**
-     * 查询查询各单位稳态指标 日/月点数（季）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
-
-    /**
-     * 查询各单位累计超标监测点数统计图-季数据
-     * @param param
-     * @return
-     */
-    List<RIconVO> getRStatHarmonicOrgQIcon(RStatHarmonicMParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java
deleted file mode 100644
index 1f11bbffb..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-public interface RStatHarmonicOrgYService extends IService<RStatHarmonicOrgY> {
-
-    /**
-     * 查询查询各单位稳态指标 日/月点数（年）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
-
-    /**
-     * 查询各单位累计超标监测点数统计图-年数据
-     * @param param
-     * @return
-     */
-    List<RIconVO> getRStatHarmonicOrgYIcon(RStatHarmonicMParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java
deleted file mode 100644
index 7906cecb1..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-public interface RStatHarmonicQService extends IService<RStatHarmonicQ> {
-
-    /**
-     * 主网查询监测点稳态指标（季）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
-
-    /**
-     *  配网查询监测点稳态指标（季）
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getPwRStatHarmonicQAll(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java
deleted file mode 100644
index 9aefcc1e0..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicY;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-public interface RStatHarmonicYService extends IService<RStatHarmonicY> {
-
-    /**
-     * 主网查询监测点稳态指标（年）
-     *
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
-
-    /**
-     * 配网查询监测点稳态指标（年）
-     *
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getPwRStatHarmonicYAll(StatisticsBizBaseParam param);
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java
deleted file mode 100644
index e8e0a356c..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatLoadTypeM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatLoadTypeService extends IService<RStatLoadTypeM> {
-
-    /**
-     * 区域干扰源电流类指标超标统计
-     * @param param
-     * @return
-     */
-    List<RArrayVO> getRStatLoadType(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java
deleted file mode 100644
index d94900a95..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-public interface RStatOrgBusbarVoltageService extends IService<RStatOrgBusbarVoltageM> {
-
-    /**
-     * 区域电站母线电压类指标超标计
-     *
-     * @param param
-     * @return
-     */
-    List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java
deleted file mode 100644
index 4cf920878..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RStatOrgVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计月表 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgMService extends IService<RStatOrgM> {
-
-    /**
-     * 查询区域超标统计-月数据
-     * @param param
-     * @return
-     */
-    List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java
deleted file mode 100644
index 30930b510..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgQ;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RStatOrgVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计季表 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgQService extends IService<RStatOrgQ> {
-
-    /**
-     * 查询区域超标统计-季数据
-     * @param param
-     * @return
-     */
-    List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java
deleted file mode 100644
index e09c1cd46..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgY;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域分类统计年表 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-public interface RStatOrgYService extends IService<RStatOrgY> {
-
-    /**
-     * 查询区域超标统计-年数据
-     *
-     * @param param
-     * @return
-     */
-    List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
-
-    /**
-     * 区域稳态指标超标分类统计表
-     *
-     * @param param
-     * @return
-     */
-    List<RStatSubstationOrg2VO> getRStatSubstationOrg(StatisticsBizBaseParam param);
-
-    /**
-     * 变电站（换流站）稳态指标超标分类统计表
-     *
-     * @param param
-     * @return
-     */
-    List<RSubstationIcon2VO.RSubstationInfoVO> getRStatSubstation(StatSubstationBizBaseParam param);
-
-    /**
-     * 区域稳态指标合格率统计表
-     *
-     * @param param
-     * @return
-     */
-    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getRStatOrgIndex(StatisticsBizBaseParam param);
-
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java
deleted file mode 100644
index 8fea53498..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationMService extends IService<RStatSubstationM> {
-
-    /**
-     * 变电站稳态指标超标分布（按超标天数）
-     *
-     * @param param
-     * @return
-     */
-    RSubstationIconVO getStatSubstationIcon(StatisticsBizBaseParam param);
-
-    /**
-     * 变电站稳态指标平均超标天数
-     *
-     * @param param
-     * @return
-     */
-    List<RSubstationIcon2VO> getStatSubstationIcon2(StatisticsBizBaseParam param);
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java
deleted file mode 100644
index 88d72bc20..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.harmonic.service;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-public interface RStatSubstationVoltageMService extends IService<RStatSubstationVoltageM> {
-
-    /**
-     * 变电站稳态指标超标分布（按电压等级）
-     * @param param
-     * @return
-     */
-    List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param);
-
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index 25a83f11f..50ab9b70d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -476,12 +476,17 @@ public class CustomReportServiceImpl implements CustomReportService {
                     .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
                     .append(InfluxDBSqlConstant.TZ);
         } else {
-            sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE)
-                    .append(InfluxDBSqlConstant.FROM).append(data.getClassId())
-                    .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getLineId()).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.TZ);
+            //cp95函数特殊处理 PERCENTILE(field_key, N)
+            if (InfluxDBSqlConstant.CP95.equals(method)){
+                sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE);
+            }else{
+                sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE);
+            }
+            sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId())
+                .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getLineId()).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.TZ);
         }
 
         //根据不同的库表赋值
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index 990dcc241..d5e2bfef6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -78,7 +78,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
             List<EventDetailVO> eventDetailVOList = new ArrayList<>();
             if (!eventDetailList.isEmpty()) {
                 for (EventDetail eventdetail : eventDetailList) {
-                    Instant now = eventdetail.getTimeId().plusMillis(TimeUnit.HOURS.toMillis(8));
+                    Instant now = eventdetail.getTimeId();
                     Long time = now.toEpochMilli();
                     String timeText = format.format(time);
                     EventDetailVO eventDetailVO = new EventDetailVO();
@@ -358,9 +358,16 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 40:
                     //谐波电压含有率
-                    sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
-                    topLimit = PubUtils.getValueByMethod(overlimit, "getUharm", number);
+                    if (number == 1) {
+                        sql = "SELECT time as time, v as aValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                        if (number < 26) {
+                            topLimit = PubUtils.getValueByMethod(overlimit, "getUharm", number);
+                        }
+                    }
                     if (ptType == 0) {
                         phasicType.add("A相");
                         phasicType.add("B相");
@@ -375,8 +382,13 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 41:
                     //谐波电流含有率
-                    sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    if (number == 1) {
+                        sql = "SELECT time as time, i as aValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
@@ -385,8 +397,13 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 42:
                     //谐波电压幅值
-                    sql = "SELECT time as time, v_" + number + " as aValue FROM data_v WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    if (number == 1) {
+                        sql = "SELECT time as time, v as aValue FROM data_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, v_" + number + " as aValue FROM data_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    }
                     if (ptType == 0) {
                         phasicType.add("A相");
                         phasicType.add("B相");
@@ -405,9 +422,16 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 43:
                     //谐波电流幅值
-                    sql = "SELECT time as time, i_" + number + " as aValue FROM data_i WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
-                    topLimit = PubUtils.getValueByMethod(overlimit, "getIharm", number);
+                    if (number == 1) {
+                        sql = "SELECT time as time, i as aValue FROM data_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, i_" + number + " as aValue FROM data_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                        if (number < 26) {
+                            topLimit = PubUtils.getValueByMethod(overlimit, "getIharm", number);
+                        }
+                    }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
@@ -416,8 +440,13 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 44:
                     //谐波电压相角
-                    sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    if (number == 1) {
+                        sql = "SELECT time as time, v as aValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    }
                     if (ptType == 0) {
                         phasicType.add("A相");
                         phasicType.add("B相");
@@ -432,8 +461,13 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 45:
                     //谐波电流相角
-                    sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
-                            " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    if (number == 1) {
+                        sql = "SELECT time as time, i as aValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    } else {
+                        sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
+                                " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc tz('Asia/Shanghai');";
+                    }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
@@ -881,7 +915,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
     }
 
     @Override
-    public List<StatHarmonicOrgVO> getHarmonicProportion(StatisticsBizBaseParam statisticsBizBaseParam){
+    public List<StatHarmonicOrgVO> getHarmonicProportion(StatisticsBizBaseParam statisticsBizBaseParam) {
 
         List<StatHarmonicOrgVO> statHarmonicOrgVOS = new ArrayList<>();
         //获取子部门
@@ -894,16 +928,16 @@ public class HistoryResultServiceImpl implements HistoryResultService {
             //年 季 月 日
             switch (statisticsBizBaseParam.getType().toString()) {
                 case BizParamConstant.STAT_BIZ_YEAR:
-                    statHarmonicOrgVOS = statHarmonicOrgYMapper.listYearRatio(depts, statisticsBizBaseParam.getStartTime(),statisticsBizBaseParam.getEndTime());
+                    statHarmonicOrgVOS = statHarmonicOrgYMapper.listYearRatio(depts, statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime());
                     break;
                 case BizParamConstant.STAT_BIZ_QUARTER:
-                    statHarmonicOrgVOS = statHarmonicOrgQMapper.listQuarterRatio(depts, statisticsBizBaseParam.getStartTime(),statisticsBizBaseParam.getEndTime());
+                    statHarmonicOrgVOS = statHarmonicOrgQMapper.listQuarterRatio(depts, statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime());
                     break;
                 case BizParamConstant.STAT_BIZ_MONTH:
-                    statHarmonicOrgVOS = statHarmonicOrgMMapper.listMonthRatio(depts, statisticsBizBaseParam.getStartTime(),statisticsBizBaseParam.getEndTime());
+                    statHarmonicOrgVOS = statHarmonicOrgMMapper.listMonthRatio(depts, statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime());
                     break;
                 case BizParamConstant.STAT_BIZ_DAY:
-                    statHarmonicOrgVOS = statHarmonicOrgDMapper.listDayRatio(depts, statisticsBizBaseParam.getStartTime(),statisticsBizBaseParam.getEndTime());
+                    statHarmonicOrgVOS = statHarmonicOrgDMapper.listDayRatio(depts, statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime());
                     break;
                 default:
                     break;
@@ -911,7 +945,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
         }
 
         //使用流对象的方法插入name值
-        if (statHarmonicOrgVOS.size() != 0){
+        if (statHarmonicOrgVOS.size() != 0) {
             statHarmonicOrgVOS = transName(statHarmonicOrgVOS, depts);
         }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
index 7f04f921e..7f0145a40 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
@@ -160,30 +160,36 @@ public class IntegrityServiceImpl implements IntegrityService {
     }
 
     @Override
-    public IntegrityIconVO getIntegrityIcon(DeviceInfoParam.CompareBusinessParam integrityIconParam) {
+    public List<IntegrityIconVO> getIntegrityIcon(DeviceInfoParam.CompareBusinessParam integrityIconParam) {
         integrityIconParam.setServerName(generalInfo.getMicroServiceName());
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(integrityIconParam).getData();
-        List<String> type = new ArrayList<>();
+        /*List<String> type = new ArrayList<>();
         List<Double> single = new ArrayList<>(),
-                ratio = new ArrayList<>();
+                ratio = new ArrayList<>();*/
+        List<IntegrityIconVO> out = new ArrayList<>();
         if (!CollectionUtils.isEmpty(generalDeviceDTOList)) {
             for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
+                IntegrityIconVO outParam = new IntegrityIconVO();
                 List<String> lineIndexes = generalDeviceDTO.getLineIndexes();
                 if (CollectionUtils.isEmpty(lineIndexes)) {
                     continue;
                 }
-                type.add(generalDeviceDTO.getName());
+//                type.add(generalDeviceDTO.getName());
+                outParam.setType(generalDeviceDTO.getName());
                 //根据监测点查询数据完整性
                 List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
-                single.add(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+//                single.add(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+                outParam.setSingle(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
                 //如果存在需要比较的时间，再获取对应数据
                 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
                     List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());
-                    ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+//                    ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+                    outParam.setRatio(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
                 }
+                out.add(outParam);
             }
         }
-        return new IntegrityIconVO(type, single, ratio);
+        return out;
     }
 
     /**
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
index 9fd47be16..0a2c0c22b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
@@ -3,20 +3,17 @@ package com.njcn.harmonic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.config.GeneralInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.SubstationFeignClient;
 import com.njcn.device.pq.pojo.dto.*;
-import com.njcn.harmonic.mapper.RMpPollutionDPOMapper;
-import com.njcn.harmonic.mapper.RStatPollutionOrgMPOMapper;
-import com.njcn.harmonic.mapper.RStatPollutionSubstationMMapper;
+import com.njcn.harmonic.mapper.*;
 import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
 import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam;
-import com.njcn.harmonic.pojo.po.RMpPollutionDPO;
-import com.njcn.harmonic.pojo.po.RStatPollutionOrgMPO;
-import com.njcn.harmonic.pojo.po.RStatPollutionSubstationM;
+import com.njcn.harmonic.pojo.po.*;
 import com.njcn.harmonic.pojo.vo.PollutionSubstationVO;
 import com.njcn.harmonic.pojo.vo.PollutionVO;
 import com.njcn.harmonic.service.PollutionSubstationService;
@@ -28,7 +25,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -50,6 +46,10 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     private final SubstationFeignClient substationFeignClient;
 
     private final RStatPollutionSubstationMMapper pollutionSubstationMMapper;
+    private final RStatPollutionSubstationYPOMapper pollutionSubstationYPOMapper;
+    private final RStatPollutionSubstationQPOMapper pollutionSubstationQPOMapper;
+    private final RStatPollutionSubstationDPOMapper pollutionSubstationDPOMapper;
+
 
     private final GeneralDeviceInfoClient generalDeviceInfoClient;
 
@@ -59,6 +59,10 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
 
 
     private final RStatPollutionOrgMPOMapper rStatPollutionOrgMPOMapper;
+    private final RStatPollutionOrgYPOMapper rStatPollutionOrgYPOMapper;
+    private final RStatPollutionOrgQPOMapper rStatPollutionOrgQPOMapper;
+    private final RStatPollutionOrgDPOMapper rStatPollutionOrgDPOMapper;
+
     private final RMpPollutionDPOMapper rMpPollutionDPOMapper;
     /**
      * @param pollutionSubstationQuryParam
@@ -96,9 +100,13 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
 
         pollutionSubstationDTOList.forEach (substationInfo ->{
 
+            Integer lineCount = lineFeignClient.getLineCountBySubstation (substationInfo.getId ( )).getData ( );
+            Integer deviceCount = lineFeignClient.getDeviceCountBySubstation (substationInfo.getId ()).getData ();
             PollutionSubstationVO pollutionSubstationVO =new PollutionSubstationVO ();
             pollutionSubstationVO.setSubstationId (substationInfo.getId ());
             pollutionSubstationVO.setSubstationName (substationInfo.getName ());
+            pollutionSubstationVO.setDeviceCount (deviceCount);
+            pollutionSubstationVO.setLineCount (lineCount);
             /*todo 添加经纬度接口返回数据暂时没有*/
             List<SubstationDTO> substationDTOList = locationData.stream ( )
                     .filter (temp -> Objects.equals (substationInfo.getId ( ), temp.getId ( )))
@@ -148,7 +156,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
 
         String pollutionType = harmonicPublicParam.getStatisticalType ( ).getId ();
 
-        String searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0,7);
+        String searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0,10);
         if (StringUtils.isBlank(RequestUtil.getDeptIndex())){
             return list;
         }
@@ -161,14 +169,44 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
             pollutionVO.setId (detpid);
             pollutionVO.setName (name);
             pollutionVO.setData (-1.0);
-            QueryWrapper<RStatPollutionOrgMPO> rStatPollutionOrgMPOQueryWrapper = new QueryWrapper<> ();
-            rStatPollutionOrgMPOQueryWrapper.eq ("org_id", detpid).
-                    eq ("pollution_type", pollutionType).
-                    apply("DATE_FORMAT( data_date ,'%Y-%m') = '"+searchBeginTime+"'");
-            RStatPollutionOrgMPO rStatPollutionOrgMPO = rStatPollutionOrgMPOMapper.selectOne (rStatPollutionOrgMPOQueryWrapper);
-            ;
+            if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_YEAR) ){
+                QueryWrapper<RStatPollutionOrgYPO> rStatPollutionOrgYPOQueryWrapper = new QueryWrapper<> ();
+                rStatPollutionOrgYPOQueryWrapper.eq ("org_id", detpid).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionOrgYPO rStatPollutionOrgYPO = rStatPollutionOrgYPOMapper.selectOne (rStatPollutionOrgYPOQueryWrapper);
+                ;
+                Optional.ofNullable (rStatPollutionOrgYPO).ifPresent (a->pollutionVO.setData (a.getValue ()));
+            }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_QUARTER)){
+                QueryWrapper<RStatPollutionOrgQPO> rStatPollutionOrgQPOQueryWrapper = new QueryWrapper<> ();
+                rStatPollutionOrgQPOQueryWrapper.eq ("org_id", detpid).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionOrgQPO rStatPollutionOrgQPO = rStatPollutionOrgQPOMapper.selectOne (rStatPollutionOrgQPOQueryWrapper);
+                ;
+                Optional.ofNullable (rStatPollutionOrgQPO).ifPresent (a->pollutionVO.setData (a.getValue ()));
+
+            }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_MONTH)){
+
+                QueryWrapper<RStatPollutionOrgMPO> rStatPollutionOrgMPOQueryWrapper = new QueryWrapper<> ();
+                rStatPollutionOrgMPOQueryWrapper.eq ("org_id", detpid).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionOrgMPO rStatPollutionOrgMPO = rStatPollutionOrgMPOMapper.selectOne (rStatPollutionOrgMPOQueryWrapper);
+                ;
+                Optional.ofNullable (rStatPollutionOrgMPO).ifPresent (a->pollutionVO.setData (a.getValue ()));
+
+            }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_DAY)){
+                QueryWrapper<RStatPollutionOrgDPO> rStatPollutionOrgDPOQueryWrapper = new QueryWrapper<> ();
+                rStatPollutionOrgDPOQueryWrapper.eq ("org_id", detpid).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionOrgDPO rStatPollutionOrgDPO = rStatPollutionOrgDPOMapper.selectOne (rStatPollutionOrgDPOQueryWrapper);
+                ;
+                Optional.ofNullable (rStatPollutionOrgDPO).ifPresent (a->pollutionVO.setData (a.getValue ()));
+            }
+
 
-            Optional.ofNullable (rStatPollutionOrgMPO).ifPresent (a->pollutionVO.setData (a.getValue ()));
 
             List<PollutionVO> subPollutionVO = new ArrayList<>();
             subIndexes.forEach (subIndex->{
@@ -179,13 +217,42 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                 pollutionsubVO.setName ( pollutionSubstationDTO.getName ());
                 pollutionsubVO.setPid (temp.getIndex ());
                 pollutionsubVO.setData (-1.0);
-                QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<> ();
-                wrapper.eq ("substation_id",id).
-                        eq ("pollution_type", pollutionType).
-                        apply("DATE_FORMAT( data_date ,'%Y-%m') = '"+searchBeginTime+"'");
-                RStatPollutionSubstationM rStatPollutionSubstationM = pollutionSubstationMMapper.selectOne (wrapper);
 
-                Optional.ofNullable (rStatPollutionSubstationM).ifPresent (t->pollutionsubVO.setData (t.getValue ()));
+                if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_YEAR) ){
+                    QueryWrapper<RStatPollutionSubstationYPO> wrapper = new QueryWrapper<> ();
+                    wrapper.eq ("substation_id",id).
+                            eq ("pollution_type", pollutionType).
+                            apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                    RStatPollutionSubstationYPO rStatPollutionSubstationYPO = pollutionSubstationYPOMapper.selectOne (wrapper);
+
+                    Optional.ofNullable (rStatPollutionSubstationYPO).ifPresent (t->pollutionsubVO.setData (t.getValue ()));
+                }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_QUARTER)){
+                    QueryWrapper<RStatPollutionSubstationQPO> wrapper = new QueryWrapper<> ();
+                    wrapper.eq ("substation_id",id).
+                            eq ("pollution_type", pollutionType).
+                            apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                    RStatPollutionSubstationQPO rStatPollutionSubstationQPO = pollutionSubstationQPOMapper.selectOne (wrapper);
+
+                    Optional.ofNullable (rStatPollutionSubstationQPO).ifPresent (t->pollutionsubVO.setData (t.getValue ()));
+                }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_MONTH)){
+                    QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<> ();
+                    wrapper.eq ("substation_id",id).
+                            eq ("pollution_type", pollutionType).
+                            apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                    RStatPollutionSubstationM rStatPollutionSubstationM = pollutionSubstationMMapper.selectOne (wrapper);
+
+                    Optional.ofNullable (rStatPollutionSubstationM).ifPresent (t->pollutionsubVO.setData (t.getValue ()));
+
+                }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_DAY)){
+                    QueryWrapper<RStatPollutionSubstationDPO> wrapper = new QueryWrapper<> ();
+                    wrapper.eq ("substation_id",id).
+                            eq ("pollution_type", pollutionType).
+                            apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                    RStatPollutionSubstationDPO rStatPollutionSubstationDPO = pollutionSubstationDPOMapper.selectOne (wrapper);
+
+                    Optional.ofNullable (rStatPollutionSubstationDPO).ifPresent (t->pollutionsubVO.setData (t.getValue ()));
+                }
+
                 subPollutionVO.add (pollutionsubVO) ;
             });
             pollutionVO.setChildren (subPollutionVO);
@@ -213,18 +280,44 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         List<GeneralDeviceDTO> sub = generalDeviceInfoClient.getPracticalRunDeviceInfoAsSubstation(deptParam).getData();
 
         String pollutionType = deptParam.getStatisticalType ( ).getId ();
-        SimpleDateFormat s = new SimpleDateFormat();
-        String searchBeginTime = deptParam.getSearchBeginTime ( ).substring (0,7);
+        String searchBeginTime = deptParam.getSearchBeginTime ( ).substring (0,10);
         sub.forEach(item->{
             PollutionSubstationDTO pollutionSubstationDTO = lineFeignClient.getSubstationInfo(item.getIndex()).getData();
+            String id = pollutionSubstationDTO.getId ();
+            if(Objects.equals (deptParam.getReportFlag (),BizParamConstant.STAT_BIZ_YEAR) ){
+                QueryWrapper<RStatPollutionSubstationYPO> wrapper = new QueryWrapper<> ();
+                wrapper.eq ("substation_id",id).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionSubstationYPO rStatPollutionSubstationYPO = pollutionSubstationYPOMapper.selectOne (wrapper);
 
-            QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<> ();
-            wrapper.eq ("substation_id",pollutionSubstationDTO.getId ()).
-                    eq ("pollution_type", pollutionType).
-                    apply("DATE_FORMAT( data_date ,'%Y-%m') = '"+searchBeginTime+"'");
-            RStatPollutionSubstationM rStatPollutionSubstationM = pollutionSubstationMMapper.selectOne (wrapper);
+                Optional.ofNullable (rStatPollutionSubstationYPO).ifPresent (t->pollutionSubstationDTO.setData (t.getValue ()));
+            }else if(Objects.equals (deptParam.getReportFlag (),BizParamConstant.STAT_BIZ_QUARTER)){
+                QueryWrapper<RStatPollutionSubstationQPO> wrapper = new QueryWrapper<> ();
+                wrapper.eq ("substation_id",id).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionSubstationQPO rStatPollutionSubstationQPO = pollutionSubstationQPOMapper.selectOne (wrapper);
 
-            Optional.ofNullable (rStatPollutionSubstationM).ifPresent (t->pollutionSubstationDTO.setData (t.getValue ()));
+                Optional.ofNullable (rStatPollutionSubstationQPO).ifPresent (t->pollutionSubstationDTO.setData (t.getValue ()));
+            }else if(Objects.equals (deptParam.getReportFlag (),BizParamConstant.STAT_BIZ_MONTH)){
+                QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<> ();
+                wrapper.eq ("substation_id",id).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionSubstationM rStatPollutionSubstationM = pollutionSubstationMMapper.selectOne (wrapper);
+
+                Optional.ofNullable (rStatPollutionSubstationM).ifPresent (t->pollutionSubstationDTO.setData (t.getValue ()));
+
+            }else if(Objects.equals (deptParam.getReportFlag (),BizParamConstant.STAT_BIZ_DAY)){
+                QueryWrapper<RStatPollutionSubstationDPO> wrapper = new QueryWrapper<> ();
+                wrapper.eq ("substation_id",id).
+                        eq ("pollution_type", pollutionType).
+                        apply("DATE_FORMAT( data_date ,'%Y-%m-%d') = '"+searchBeginTime+"'");
+                RStatPollutionSubstationDPO rStatPollutionSubstationDPO = pollutionSubstationDPOMapper.selectOne (wrapper);
+
+                Optional.ofNullable (rStatPollutionSubstationDPO).ifPresent (t->pollutionSubstationDTO.setData (t.getValue ()));
+            }
 
             list.add(pollutionSubstationDTO);
         });
@@ -250,8 +343,17 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
 
         String pollutionType = harmonicPublicParam.getStatisticalType ( ).getId ();
         String code = harmonicPublicParam.getStatisticalType ( ).getCode ();
+        String searchBeginTime = "";
+        if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_YEAR) ){
+            searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 4)+"%";
 
-        String searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0,7);
+        }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_MONTH)){
+            searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 7)+"%";
+
+
+        }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_DAY)) {
+            searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 10)+"%";
+        }
         PollutionParamDTO paramDTO = new PollutionParamDTO();
         if (StringUtils.isBlank(RequestUtil.getDeptIndex())){
             return list;
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
index bbee3dd02..b83790583 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
@@ -8,13 +8,17 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.harmonic.mapper.RMpBenchmarkLevelMMapper;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 import com.njcn.harmonic.service.RMpBenchmarkLevelMService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -47,6 +51,8 @@ implements RMpBenchmarkLevelMService {
 
     private final MonitorClient monitorClient;
 
+    private final PwMonitorClient pwMonitorClient;
+
     @Override
     public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
         //提取查询条件
@@ -126,4 +132,53 @@ implements RMpBenchmarkLevelMService {
         }).collect(Collectors.toList());
         return resultList;
     }
+
+    @Override
+    public List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //根据条件查询单位下面的所有配网监测点
+        PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
+        pwPmsMonitorParam.setOrgId(id); //单位id
+        pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级
+        List<PwPmsMonitorDTO> pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        if (CollUtil.isEmpty(pwMonitorList)) {
+            return new ArrayList<>();
+        }
+        //监测点id集合
+        List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+        //监测点map  key:监测点id  value:监测点实体
+        Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor));
+
+        //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelM::getMeasurementPointId, monitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelM::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelM::getDataDate, endTime);
+        List<RMpBenchmarkLevelM> list = this.list(lambdaQueryWrapper);
+        List<PwRMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
index b47c36f71..4da58d6c3 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
@@ -8,13 +8,17 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.harmonic.mapper.RMpBenchmarkLevelQMapper;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 import com.njcn.harmonic.service.RMpBenchmarkLevelQService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -47,6 +51,8 @@ implements RMpBenchmarkLevelQService {
 
     private final MonitorClient monitorClient;
 
+    private final PwMonitorClient pwMonitorClient;
+
     @Override
     public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
         //提取查询条件
@@ -126,4 +132,53 @@ implements RMpBenchmarkLevelQService {
         }).collect(Collectors.toList());
         return resultList;
     }
+
+    @Override
+    public List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //根据条件查询单位下面的所有配网监测点
+        PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
+        pwPmsMonitorParam.setOrgId(id); //单位id
+        pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级
+        List<PwPmsMonitorDTO> pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        if (CollUtil.isEmpty(pwMonitorList)) {
+            return new ArrayList<>();
+        }
+        //监测点id集合
+        List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+        //监测点map  key:监测点id  value:监测点实体
+        Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor));
+
+        //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelQ> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelQ::getMeasurementPointId, monitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelQ::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelQ::getDataDate, endTime);
+        List<RMpBenchmarkLevelQ> list = this.list(lambdaQueryWrapper);
+        List<PwRMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
index 5e56ad239..b9ad500ca 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
@@ -8,13 +8,17 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.harmonic.mapper.RMpBenchmarkLevelYMapper;
 import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
 import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO;
 import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
 import com.njcn.harmonic.service.RMpBenchmarkLevelYService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -47,6 +51,8 @@ implements RMpBenchmarkLevelYService {
 
     private final MonitorClient monitorClient;
 
+    private final PwMonitorClient pwMonitorClient;
+
     @Override
     public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
         //提取查询条件
@@ -126,4 +132,60 @@ implements RMpBenchmarkLevelYService {
         }).collect(Collectors.toList());
         return resultList;
     }
+
+    /***
+     * 配网-全网基准水平
+     * @author jianghaifei
+     * @date 2022-11-04 10:32
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO>
+     */
+    @Override
+    public List<PwRMpBenchmarkLevelVO> getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //根据条件查询单位下面的所有配网监测点
+        PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
+        pwPmsMonitorParam.setOrgId(id); //单位id
+        pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级
+        List<PwPmsMonitorDTO> pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        if (CollUtil.isEmpty(pwMonitorList)) {
+            return new ArrayList<>();
+        }
+        //监测点id集合
+        List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+        //监测点map  key:监测点id  value:监测点实体
+        Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor));
+
+      //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelY> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelY::getMeasurementPointId, monitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelY::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelY::getDataDate, endTime);
+        List<RMpBenchmarkLevelY> list = this.list(lambdaQueryWrapper);
+        List<PwRMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
index e2f7a7073..4cd2a9fc7 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Service实现
 * @createDate 2022-10-20 18:38:15
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
index 034e8706e..b4acb49be 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Service实现
 * @createDate 2022-10-20 18:43:52
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
index e1840ca18..487b8cf65 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Service实现
 * @createDate 2022-10-20 18:45:58
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
index c65827852..b16291cf6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Service实现
 * @createDate 2022-10-20 18:45:36
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
index 7c738ca9d..8f183768c 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_measure_phase_report_d】的数据库操作Service实现
 * @createDate 2022-10-20 18:20:08
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
index 61e566f90..a9ff66a7f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @author Administrator
+* @author jianghf
 * @description 针对表【r_mp_measure_report_d】的数据库操作Service实现
 * @createDate 2022-10-20 16:32:37
 */
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java
deleted file mode 100644
index 53d8a79d5..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
-import com.njcn.harmonic.mapper.RMpPartHarmonicDetailDMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
-import com.njcn.harmonic.service.RMpPartHarmonicDetailDService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-@Service
-@RequiredArgsConstructor
-public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmonicDetailDMapper, RMpPartHarmonicDetailD> implements RMpPartHarmonicDetailDService {
-
-    private final RMpPartHarmonicDetailDMapper rMpPartHarmonicDetailDMapper;
-
-
-    @Override
-    public List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param) {
-        return rMpPartHarmonicDetailDMapper.getRMpPartHarmonicDetailIcon(param);
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java
deleted file mode 100644
index d30dac156..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.MonitorClient;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.pojo.param.PmsMonitorParam;
-import com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailMMapper;
-import com.njcn.harmonic.pojo.param.RStatOrgParam;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
-import com.njcn.harmonic.mapper.RMpPartHarmonicDetailMMapper;
-import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
-import com.njcn.harmonic.service.RMpPartHarmonicDetailMService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.pojo.po.DictData;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-@Service
-@RequiredArgsConstructor
-public class RMpPartHarmonicDetailMServiceImpl extends ServiceImpl<RMpPartHarmonicDetailMMapper, RMpPartHarmonicDetailM> implements RMpPartHarmonicDetailMService {
-
-    private final RMpSurplusHarmonicDetailMMapper rMpSurplusHarmonicDetailMMapper;
-    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
-    private final MonitorClient monitorClient;
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(RStatOrgParam param) {
-        //根据部门获取监测点信息(根据部门过滤基本信息)
-        PmsDeviceInfoParam pms = new PmsDeviceInfoParam();
-        pms.setDeptIndex(param.getId());
-        pms.setStatisticalType(new SimpleDTO());
-        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
-        List<String> addIds = new ArrayList<>();
-        data.stream().forEach(e -> addIds.addAll(e.getMonitorIdList()));
-
-        if (CollectionUtil.isNotEmpty(addIds)) {
-            //根据监测点ids获取监测点相关详细信息(变电站id，电压id，监测点名称)
-            PmsMonitorParam dto = BeanUtil.copyProperties(param, PmsMonitorParam.class);
-            dto.setMonitorIds(addIds);
-            dto.setMonitorName(param.getMonitorName());
-            dto.setVoltageLevels(param.getVoltageLevels());
-            dto.setPowerrIds(param.getPowerrIds());
-            List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
-            Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
-                    .collect(Collectors.toMap(PmsMonitorDTO::getId, Function.identity()));
-            //获取电压等级
-            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
-            Map<String, DictData> devVoltageMap = devVoltageData.stream()
-                    .collect(Collectors.toMap(DictData::getId, Function.identity()));
-            //获取最新过滤的监测点id
-            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList());
-            //筛选出数据库对应监测点
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(ids);
-            List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpSurplusHarmonicDetailMMapper.getRMpPartHarmonicDetail(baseParam);
-            if (CollectionUtil.isNotEmpty(rMpPartHarmonicDetail)) {
-                //因为只有月表，数据进行查询可能出现重复数据。进行分组
-                Map<String, List<RMpPartHarmonicDetailVO>> detailVOMap = rMpPartHarmonicDetail.stream()
-                        .collect(Collectors.groupingBy(RMpPartHarmonicDetailVO::getMeasurementPointId));
-                detailVOMap.forEach((Key, value) -> {
-                    if (pmsMonitorDTOMap.containsKey(Key)) {
-                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
-                        for (RMpPartHarmonicDetailVO rmp : value) {
-                            rmp.setOrgName(dto1.getOrgName());
-                            rmp.setPowerrName(dto1.getPowerrName());
-                            rmp.setMeasurementPointName(dto1.getName());
-                            //获取字典电压等级名称
-                            if (devVoltageMap.containsKey(dto1.getVoltageLevel())) {
-                                DictData data1 = devVoltageMap.get(dto1.getVoltageLevel());
-                                rmp.setMonitorVoltageName(data1.getName());
-                            }
-                        }
-
-                    }
-                });
-            }
-            return rMpPartHarmonicDetail;
-        }
-        return null;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java
deleted file mode 100644
index 2f32f05e5..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.MonitorClient;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.pojo.param.PmsMonitorParam;
-import com.njcn.harmonic.mapper.RMpPassRateMMapper;
-import com.njcn.harmonic.mapper.RMpPassRateYMapper;
-import com.njcn.harmonic.pojo.param.RStatOrgParam;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpPassRateQ;
-import com.njcn.harmonic.mapper.RMpPassRateQMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
-import com.njcn.harmonic.service.RMpPassRateService;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.pojo.po.DictData;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-24
- */
-@Service
-@RequiredArgsConstructor
-public class RMpPassRateServiceImpl extends ServiceImpl<RMpPassRateQMapper, RMpPassRateQ> implements RMpPassRateService {
-
-    private final RMpPassRateYMapper rMpPassRateYMapper;
-    private final RMpPassRateQMapper rMpPassRateQMapper;
-    private final RMpPassRateMMapper rMpPassRateMMapper;
-    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
-    private final MonitorClient monitorClient;
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public List<RStatOrgIndexVO> getRMpPassRateInfo(RStatOrgParam param) {
-        //初始化对象
-        List<RStatOrgIndexVO> temp = new ArrayList<>();
-        //根据部门获取监测点信息
-        PmsDeviceInfoParam pms = new PmsDeviceInfoParam();
-        pms.setDeptIndex(param.getId());
-        pms.setStatisticalType(new SimpleDTO());
-        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
-        List<String> addIds = new ArrayList<>();
-        data.stream().forEach(e -> addIds.addAll(e.getMonitorIdList()));
-
-        if (CollectionUtil.isNotEmpty(addIds)) {
-            //根据监测点ids获取监测点相关详细信息(变电站id，电压id，监测点名称)
-            PmsMonitorParam dto = BeanUtil.copyProperties(param, PmsMonitorParam.class);
-            dto.setMonitorIds(addIds);
-            dto.setMonitorName(param.getMonitorName());
-            dto.setVoltageLevels(param.getVoltageLevels());
-            dto.setPowerrIds(param.getPowerrIds());
-            List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
-            Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
-                    .collect(Collectors.toMap(PmsMonitorDTO::getId, Function.identity()));
-            //获取电压等级
-            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
-            Map<String, DictData> devVoltageMap = devVoltageData.stream()
-                    .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-            //获取最新过滤的监测点id
-            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList());
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(ids);
-
-            if (CollectionUtil.isNotEmpty(addIds)) {
-                // 类型（1年 2季度 3月份
-                switch (param.getType().toString()) {
-                    case BizParamConstant.STAT_BIZ_YEAR:
-                        // 获取年稳态指标合格率明细表
-                        temp = rMpPassRateYMapper.getYearPassRate(baseParam);
-                        break;
-                    case BizParamConstant.STAT_BIZ_QUARTER:
-                        // 获取季稳态指标合格率明细表
-                        temp = rMpPassRateQMapper.getQuarterPassRate(baseParam);
-                        break;
-                    case BizParamConstant.STAT_BIZ_MONTH:
-                        // 获取月稳态指标合格率明细表
-                        temp = rMpPassRateMMapper.getMonthPassRate(baseParam);
-                        break;
-                    default:
-                        break;
-
-                }
-            }
-            if (CollectionUtil.isNotEmpty(temp)) {
-                Map<String, RStatOrgIndexVO> collect = temp.stream()
-                        .collect(Collectors.toMap(RStatOrgIndexVO::getMeasurementPointId, Function.identity()));
-                collect.forEach((Key, value) -> {
-                    if (pmsMonitorDTOMap.containsKey(Key)) {
-                        //根据监测点信息，进行属性赋值
-                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
-                        value.setOrgNo(dto1.getOrgId());
-                        value.setOrgName(dto1.getOrgName());
-                        value.setMeasurementPointName(dto1.getName());
-                        value.setPowerrName(dto1.getPowerrName());
-                        //获取电压字典的名称
-                        if (devVoltageMap.containsKey(dto1.getVoltageLevel())) {
-                            DictData data1 = devVoltageMap.get(dto1.getVoltageLevel());
-                            value.setMonitorVoltageName(data1.getName());
-                        }
-                    }
-                });
-                return new ArrayList<>(collect.values());
-            }
-
-        }
-        return new ArrayList<>();
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java
deleted file mode 100644
index f0c8420f7..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java
+++ /dev/null
@@ -1,599 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-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.harmonic.mapper.RStatHarmonicDMapper;
-import com.njcn.harmonic.mapper.RStatHarmonicMMapper;
-import com.njcn.harmonic.mapper.RStatHarmonicVoltageMMapper;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicD;
-import com.njcn.harmonic.pojo.po.RStatHarmonicM;
-import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
-import com.njcn.harmonic.pojo.po.RStatHarmonicY;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicMService;
-import com.njcn.device.pq.utils.PublicDateUtil;
-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 lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-09
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper, RStatHarmonicM> implements RStatHarmonicMService {
-
-    private final RStatHarmonicMMapper rStatHarmonicMMapper;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final RStatHarmonicVoltageMMapper rStatHarmonicVoltageMMapper;
-    private final RStatHarmonicDMapper rStatHarmonicDMapper;
-
-    @Override
-    public List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
-
-        //子节点 获取所有得干扰源类型（监测点类型）
-        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //对象主节点 获取所有得指标类型
-        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicM> list = rStatHarmonicMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicM>()
-                .eq(RStatHarmonicM::getDataType,mainnetData.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicM::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicM::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicMVO> rm=new ArrayList<>();
-        for (DictData lineTypeDatum : interferenceSourceTypeData) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(lineTypeDatum.getName());
-            r.setSort(lineTypeDatum.getSort());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setSort(lineTypeDatum.getSort());
-            r.setColumns(rm);
-            arrayVOList.add(r);
-        }
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicM>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicM::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-            if(lineTypeMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b=new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicM rStatHarmonicM : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicM, RStatHarmonicMVO.class);
-                    DictData data1 = interferenceMap.get(rStatHarmonicM.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    Float averageOverDay = Float.parseFloat(
-                            df.format(r.getOverDay()/(r.getOverLimitMeasurementAccrued()*1.0)));
-                    r.setAverageOverDay(averageOverDay);
-                    b.add(r);
-                }
-                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-        });
-        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
-        aa.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return aa;
-    }
-
-    @Override
-    public List<RIconVO> getRStatHarmonicIconVoltage(RStatHarmonicMParam param) {
-        //干扰数据类型（监测对象）
-        DictData measurementDate =null;
-        //指标对象类型属性
-        DictData harmonicDate =null;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //干扰数据类型（监测对象）
-            List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-            interferenceSourceTypeData.sort(Comparator.comparing(data -> data.getSort()));
-            measurementDate =interferenceSourceTypeData.get(0);
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取检测点对象（电压）
-            measurementDate = dicDataFeignClient.getDicDataById(
-                    param.getMonitorID()).getData();
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                ObjectUtil.isNotNull(measurementDate)||ObjectUtil.isNotNull(harmonicDate)
-                , "干扰源类型或者指标类型为空,请检查入参是否准确");
-        //获取电压字典
-        List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
-        Map<String, DictData> devVoltageMap = devVoltageData.stream()
-                .collect(Collectors.toMap(DictData::getId,  Function.identity()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //初始化对象
-        List<RIconVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicVoltageM> rStatHarmonicVoltageMS = rStatHarmonicVoltageMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicVoltageM>()
-                .eq(RStatHarmonicVoltageM::getDataType,mainnetData.getId())
-                .eq(RStatHarmonicVoltageM::getMeasurementTypeClass, measurementDate.getId())
-                .eq(RStatHarmonicVoltageM::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicVoltageM::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicVoltageM::getDataDate, param.getEndTime())
-        );
-        //将数据转换为map进行便利
-        Map<String, RStatHarmonicVoltageM> voltageMMap = rStatHarmonicVoltageMS.stream()
-                .collect(Collectors.toMap(RStatHarmonicVoltageM::getVoltageType, Function.identity()));
-        //对象
-        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
-            voltageMMap.forEach((key, value) -> {
-                if(devVoltageMap.containsKey(key)){
-                    DictData data = devVoltageMap.get(key);
-                    RIconVO rIconVO = new RIconVO();
-                    rIconVO.setRowName(data.getName());
-                    rIconVO.setSort(data.getSort());
-                    rIconVO.setOverLimitMeasurementAccrued(value.getOverLimitMeasurementAccrued());
-                    rIconVO.setOverLimitMeasurementAverage(value.getOverLimitMeasurementAverage());
-                    rIconVO.setOverLimitMeasurementRatioAccrued(value.getOverLimitMeasurementRatioAccrued());
-                    rIconVO.setOverLimitMeasurementRatioAverage(value.getOverLimitMeasurementRatioAverage());
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    Float averageOverDay = Float.parseFloat(
-                            df.format(value.getOverDay()/(value.getOverLimitMeasurementAccrued()*1.0)));
-                    rIconVO.setAverageOverDay(averageOverDay);
-                    arrayVOList.add(rIconVO);
-                }
-            });
-        }
-        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort()));
-        return arrayVOList;
-    }
-
-    @SneakyThrows
-    @Override
-    public List<RHarmonicPolylineVO> getRStatHarmonicIconDate(RStatHarmonicMParam param) {
-        //初始化对象
-        List<RHarmonicPolylineVO> iconList=new ArrayList<>();
-        DictData measurementDate;
-        //指标对象类型属性
-        DictData harmonicDate;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //干扰数据类型（监测对象）
-            List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-            interferenceSourceTypeData.sort(Comparator.comparing(data -> data.getSort()));
-            measurementDate =interferenceSourceTypeData.get(0);
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取检测点对象（电压）
-            measurementDate = dicDataFeignClient.getDicDataById(
-                    param.getMonitorID()).getData();
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                ObjectUtil.isNotNull(measurementDate)||ObjectUtil.isNotNull(harmonicDate)
-                , "干扰源类型或者指标类型为空,请检查入参是否准确");
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        List<RStatHarmonicD> rStatHarmonicVoltageMS = rStatHarmonicDMapper.selectList(new LambdaQueryWrapper<RStatHarmonicD>()
-                .eq(RStatHarmonicD::getDataType,mainnetData.getId())
-                .eq(RStatHarmonicD::getMeasurementTypeClass, measurementDate.getId())
-                .eq(RStatHarmonicD::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicD::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicD::getDataDate, param.getEndTime())
-        );
-        Map<LocalDate, List<RStatHarmonicD>> collect =
-                rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate));
-
-        //获取月份
-        List<String> intervalTime = this.getIntervalTime(param.getStartTime(), param.getEndTime());
-        for (String interTime : intervalTime) {
-            //生成初始时间
-            String startTime = PublicDateUtil.getFisrtDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
-            String endTime = PublicDateUtil.getLastDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date dt = simpleDateFormat.parse(startTime);
-            Date dtDate = simpleDateFormat.parse(endTime);
-            Integer year = Integer.valueOf(String.format("%tY", dt));
-            Integer mon = Integer.valueOf(String.format("%tm", dt));
-            Integer day = Integer.valueOf(String.format("%td", dtDate));
-            //生成月份数据
-            List<String> dayTime = this.getIntervalDateTime(year, mon,day);
-            for (String s : dayTime) {
-                RHarmonicPolylineVO rPolylineVO=new RHarmonicPolylineVO();
-                rPolylineVO.setDate(s);
-                if(collect.containsKey(LocalDateTimeUtil.parseDate(s,"yyyy-MM-dd"))){
-                    List<RStatHarmonicD> rSd = collect.get(LocalDateTimeUtil.parseDate(s, "yyyy-MM-dd"));
-                    rPolylineVO.setNum(rSd.get(0).getOverLimitMeasurement());
-                    rPolylineVO.setOverLimitMeasurementRatioAverage(rSd.get(0).getOverLimitMeasurementRatio());
-                    rPolylineVO.setAverageOverDay(1);
-                }else{
-                    rPolylineVO.setNum(0);
-                    rPolylineVO.setAverageOverDay(0);
-                    rPolylineVO.setOverLimitMeasurementRatioAverage(0.0f);
-                }
-                iconList.add(rPolylineVO);
-            }
-
-        }
-        return iconList;
-    }
-
-    @Override
-    public List<RArrayVO> getPwRStatHarmonicMAll(StatisticsBizBaseParam param) {
-        //对象主节点 获取所有的稳态类型
-        List<DictData> eventData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> eventMap = eventData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //子节点获取监测点类别
-        List<DictData> lineData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.LINE_SORT.getCode()).getData();
-        Map<String, DictData> lineMap = lineData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //获取配网id信息
-        DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        //数据库查询
-        List<RStatHarmonicM> list = rStatHarmonicMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicM>()
-                .eq(RStatHarmonicM::getDataType,distributionData.getId())
-                .ge(param.getStartTime()!=null, RStatHarmonicM::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicM::getDataDate, param.getEndTime()));
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicM>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicM::getHarmonicType));
-        //重新生成数据结构
-        measurementMap.forEach((key, value) -> {
-            List<RStatHarmonicMVO> eventVO=new ArrayList<>();
-            if(eventMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = eventMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                for (RStatHarmonicM statHarmonic : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(statHarmonic, RStatHarmonicMVO.class);
-                    DictData data1 = lineMap.get(statHarmonic.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    Float averageOverDay = Float.parseFloat(
-                            df.format(r.getOverDay()/(r.getOverLimitMeasurementAccrued()*1.0)));
-                    r.setAverageOverDay(averageOverDay);
-                    eventVO.add(r);
-                }
-                //根据监测点类别获取差集
-                Map<String, List<RStatHarmonicM>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicM::getMeasurementTypeClass));
-                List<DictData> differenceList = lineData.stream().filter(r -> !listMap.containsKey(r.getId()))
-                        .collect(Collectors.toList());
-                this.assignDict(differenceList, eventVO, arrayVO);
-                arrayVO.setColumns(eventVO);
-                eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-                arrayVOList.add(arrayVO);
-            }
-        });
-        //处理主节点不存在的集合
-        List<DictData> notMeasurementList = eventData.stream().filter(r -> !measurementMap.containsKey(r.getId()))
-                .collect(Collectors.toList());
-        for (DictData notData : notMeasurementList) {
-            List<RStatHarmonicMVO> statharmonicVO=new ArrayList<>();
-            RArrayVO arrayVO=new RArrayVO();
-            arrayVO.setRowName(notData.getName());
-            arrayVO.setSort(notData.getSort());
-            this.assignDict(lineData, statharmonicVO, arrayVO);
-            statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-            arrayVOList.add(arrayVO);
-        }
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return arrayVOList;
-    }
-
-    @SneakyThrows
-    @Override
-    public List<RHarmonicPolylineVO> getPwRStatHarmonicIconDate(RStatHarmonicMParam param) {
-        //初始化对象
-        List<RHarmonicPolylineVO> iconList=new ArrayList<>();
-        DictData measurementDate;
-        //指标对象类型属性
-        DictData harmonicDate;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //干扰数据类型（监测对象）
-            List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.LINE_SORT.getCode()).getData();
-            interferenceSourceTypeData.sort(Comparator.comparing(data -> data.getSort()));
-            measurementDate =interferenceSourceTypeData.get(0);
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取检测点对象（电压）
-            measurementDate = dicDataFeignClient.getDicDataById(
-                    param.getMonitorID()).getData();
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                ObjectUtil.isNotNull(measurementDate)||ObjectUtil.isNotNull(harmonicDate)
-                , "监测点类别或者指标类型为空,请检查入参是否准确");
-        //获取配网信息
-        DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
-
-        List<RStatHarmonicD> rStatHarmonicVoltageMS = rStatHarmonicDMapper.selectList(new LambdaQueryWrapper<RStatHarmonicD>()
-                .eq(RStatHarmonicD::getDataType,distributionData.getId())
-                .eq(RStatHarmonicD::getMeasurementTypeClass, measurementDate.getId())
-                .eq(RStatHarmonicD::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicD::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicD::getDataDate, param.getEndTime())
-        );
-        Map<LocalDate, List<RStatHarmonicD>> collect =
-                rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate));
-
-        //获取月份
-        List<String> intervalTime = this.getIntervalTime(param.getStartTime(), param.getEndTime());
-        for (String interTime : intervalTime) {
-            //生成初始时间
-            String startTime = PublicDateUtil.getFisrtDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
-            String endTime = PublicDateUtil.getLastDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date dt = simpleDateFormat.parse(startTime);
-            Date dtDate = simpleDateFormat.parse(endTime);
-            Integer year = Integer.valueOf(String.format("%tY", dt));
-            Integer mon = Integer.valueOf(String.format("%tm", dt));
-            Integer day = Integer.valueOf(String.format("%td", dtDate));
-            //生成月份数据
-            List<String> dayTime = this.getIntervalDateTime(year, mon,day);
-            for (String s : dayTime) {
-                RHarmonicPolylineVO rPolylineVO=new RHarmonicPolylineVO();
-                rPolylineVO.setDate(s);
-                if(collect.containsKey(LocalDateTimeUtil.parseDate(s,"yyyy-MM-dd"))){
-                    List<RStatHarmonicD> rSd = collect.get(LocalDateTimeUtil.parseDate(s, "yyyy-MM-dd"));
-                    rPolylineVO.setNum(rSd.get(0).getOverLimitMeasurement());
-                    rPolylineVO.setOverLimitMeasurementRatioAverage(rSd.get(0).getOverLimitMeasurementRatio());
-                    rPolylineVO.setAverageOverDay(1);
-                }else{
-                    rPolylineVO.setNum(0);
-                    rPolylineVO.setAverageOverDay(0);
-                    rPolylineVO.setOverLimitMeasurementRatioAverage(0.0f);
-                }
-                iconList.add(rPolylineVO);
-            }
-
-        }
-        return iconList;
-    }
-
-    /**
-     * 便利赋值
-     * @param DictDataList 稳态指标类型集合
-     * @param statharmonicVO   暂态监测点
-     * @param arrayVO   初始化对象
-     */
-    private void assignDict(List<DictData> DictDataList, List<RStatHarmonicMVO> statharmonicVO, RArrayVO arrayVO) {
-        for (DictData dictData : DictDataList) {
-            RStatHarmonicMVO notStatHarmonicVO=new RStatHarmonicMVO();
-            notStatHarmonicVO.setHarmonicName(dictData.getName());
-            notStatHarmonicVO.setSort(dictData.getSort());
-            notStatHarmonicVO.setOverLimitMeasurementAverage(0);
-            notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
-            notStatHarmonicVO.setOverDay(0);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAccrued(0.0F);
-            notStatHarmonicVO.setAverageOverDay(0.0F);
-            statharmonicVO.add(notStatHarmonicVO);
-        }
-        arrayVO.setColumns(statharmonicVO);
-    }
-
-    /**
-        * 根据用户选择的时间区间返回月份日期
-     */
-    @SneakyThrows
-    private List<String> getIntervalTime(String startTime, String endTime) {
-        List<String> times = new ArrayList<>();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-        Date start = sdf.parse(startTime);
-        Date end = sdf.parse(endTime);
-        // 同月
-        if (start.getTime() == end.getTime()) {
-            String time = startTime.substring(0, 7);
-            times.add(time);
-        } else if (start.getYear() == end.getYear()) {
-            // 同年
-            int startM = start.getMonth() + 1;
-            int endM = end.getMonth() + 1;
-            int temp = endM - startM;
-            for (int i = 0; i <= temp; i++) {
-                String time = start.getYear() + 1900 + "";
-                int month = startM + i;
-                if (month < 10) {
-                    time = time + "-0" + month;
-                } else {
-                    time = time + "-" + month;
-                }
-                times.add(time);
-            }
-        } else {
-            // 不同年!!!!这里忽略了年份之间跨年的情况
-            int startY = start.getYear() + 1900;
-            int startM = start.getMonth() + 1;
-            int endY = end.getYear() + 1900;
-            int endM = end.getMonth() + 1;
-            int tempS = 12 - startM;
-            // 连续的年份
-            if (endY - startY == 1) {
-                // 第一年的时间获取
-                for (int i = 0; i <= tempS; i++) {
-                    int month = startM + i;
-                    String time = startY + "-";
-                    if (month < 10) {
-                        time = time + "0" + month;
-                    } else {
-                        time = time + month;
-                    }
-                    times.add(time);
-                }
-                // 第二年的时间获取
-
-                for (int i = 1; i <= endM; i++) {
-                    String time = endY + "-";
-                    if (i < 10) {
-                        time = time + "0" + i;
-                    } else {
-                        time = time + i;
-                    }
-                    times.add(time);
-                }
-            } else {
-                // 不连续的年份
-                // 第一年的时间获取
-                for (int i = 0; i <= tempS; i++) {
-                    int month = startM + i;
-                    String time = startY + "-";
-                    if (month < 10) {
-                        time = time + "0" + month;
-                    } else {
-                        time = time + month;
-                    }
-                    times.add(time);
-                }
-                int tempY = endY - startY;
-                // 中间年份的时间
-                for (int i = 1; i < tempY; i++) {
-                    for (int j = 1; j <= 12; j++) {
-                        String time = startY + i + "-";
-                        if (j < 10) {
-                            time = time + "0" + j;
-                        } else {
-                            time = time + j;
-                        }
-                        times.add(time);
-                    }
-                }
-                // 最后一年的时间获取
-                for (int i = 1; i <= endM; i++) {
-                    String time = endY + "-";
-                    if (i < 10) {
-                        time = time + "0" + i;
-                    } else {
-                        time = time + i;
-                    }
-                    times.add(time);
-                }
-            }
-
-        }
-        return times;
-    }
-
-    @SneakyThrows
-    private List<String> getIntervalDateTime(Integer startTime, Integer endTime, Integer dd) {
-        List<String> list = new ArrayList<>();
-        Calendar calendar = Calendar.getInstance(Locale.CHINA);
-        calendar.set(startTime, endTime - 1, 1);
-        //年份
-        int year = calendar.get(Calendar.YEAR);
-        //月份
-        int month = calendar.get(Calendar.MONTH) + 1;
-        for (int i = 1; i <= dd; i++) {
-            String date = null;
-            if (month < 10 && i < 10) {
-                date = year + "-0" + month + "-0" + i;
-            }
-            if (month < 10 && i >= 10) {
-                date = year + "-0" + month + "-" + i;
-            }
-            if (month >= 10 && i < 10) {
-                date = year + "-" + month + "-0" + i;
-            }
-            if (month >= 10 && i >= 10) {
-                date = year + "-" + month + "-" + i;
-            }
-
-            list.add(date);
-        }
-        return list;
-    }
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java
deleted file mode 100644
index 88ae82484..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
-import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicOrgMService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMapper, RStatHarmonicOrgM> implements RStatHarmonicOrgMService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final StatHarmonicOrgMMapper statHarmonicOrgMMapper;
-
-    @Override
-    public List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
-        //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
-                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicOrgM> list = statHarmonicOrgMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgM>()
-                .eq(RStatHarmonicOrgM::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgM::getOrgNo,deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgM::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgM::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicMVO> rm=new ArrayList<>();
-        for (DeptDTO deptDTO : deptDTOList) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(deptDTO.getName());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setColumns(rm);
-            r.setSort(lineTypeDatum.getSort());
-            arrayVOList.add(r);
-        }
-        //根据检测点对象分组
-        Map<String, List<RStatHarmonicOrgM>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgM::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-            if(lineTypeMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b=new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicOrgM orgY : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
-                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
-                    if (ObjectUtil.isNotNull(data1)){
-                        r.setHarmonicName(data1.getName());
-                        DecimalFormat df = new DecimalFormat("###.00");
-                        Float averageOverDay = Float.parseFloat(
-                                df.format(r.getOverDay()/(r.getOverLimitMeasurementAccrued()*1.0)));
-                        r.setAverageOverDay(averageOverDay);
-                        b.add(r);
-                    }
-                }
-                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-
-        });
-        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
-        return aa;
-    }
-
-    @Override
-    public List<RIconVO> getRStatHarmonicOrgMIcon(RStatHarmonicMParam param) {
-        //各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
-        //获取部门id集合
-        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        //指标对象类型属性
-        DictData harmonicDate =null;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
-                , "各单位或者指标类型为空,请检查入参是否准确");
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //初始化对象
-        List<RIconVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicOrgM> rStatHarmonicVoltageMS = statHarmonicOrgMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgM>()
-                .eq(RStatHarmonicOrgM::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgM::getOrgNo,deptIds)
-                .eq(RStatHarmonicOrgM::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgM::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgM::getDataDate, param.getEndTime())
-        );
-        //将数据转换为map进行便利
-        Map<String, List<RStatHarmonicOrgM>> voltageMMap = rStatHarmonicVoltageMS.stream()
-                .collect(Collectors.groupingBy(RStatHarmonicOrgM::getOrgNo));
-        //对象
-        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
-            voltageMMap.forEach((key, value) -> {
-                if(deptMap.containsKey(key)){
-                    DeptDTO data = deptMap.get(key);
-                    for (RStatHarmonicOrgM orgM : value) {
-                        RIconVO rIconVO = new RIconVO();
-                        rIconVO.setRowName(data.getName());
-//                    rIconVO.setSort(data.getSort());
-                        rIconVO.setOverLimitMeasurementAccrued(orgM.getOverLimitMeasurementAccrued());
-                        rIconVO.setOverLimitMeasurementAverage(orgM.getOverLimitMeasurementAverage());
-                        rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
-                        rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
-                        DecimalFormat df = new DecimalFormat("###.00");
-                        Float averageOverDay = Float.parseFloat(
-                                df.format(orgM.getOverDay()/(orgM.getOverLimitMeasurementAccrued()*1.0)));
-                        rIconVO.setAverageOverDay(averageOverDay);
-                        arrayVOList.add(rIconVO);
-                    }
-
-                }
-            });
-        }
-        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
-        return arrayVOList;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java
deleted file mode 100644
index e4589dcd9..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
-import com.njcn.harmonic.mapper.StatHarmonicOrgQMapper;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicOrgQService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMapper, RStatHarmonicOrgQ> implements RStatHarmonicOrgQService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final StatHarmonicOrgQMapper statHarmonicOrgQMapper;
-    @Override
-    public List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
-        //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
-                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicOrgQ> list = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
-                .eq(RStatHarmonicOrgQ::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgQ::getOrgNo,deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicMVO> rm=new ArrayList<>();
-        for (DeptDTO deptDTO : deptDTOList) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(deptDTO.getName());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setColumns(rm);
-            r.setSort(lineTypeDatum.getSort());
-            arrayVOList.add(r);
-        }
-        //根据检测点对象分组
-        Map<String, List<RStatHarmonicOrgQ>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-            if(lineTypeMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b=new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicOrgQ orgY : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
-                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
-                    if (ObjectUtil.isNotNull(data1)){
-                        r.setHarmonicName(data1.getName());
-                        r.setOverDay(0);
-                        b.add(r);
-                    }
-                }
-                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-
-        });
-        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
-        return aa;
-    }
-
-    @Override
-    public List<RIconVO> getRStatHarmonicOrgQIcon(RStatHarmonicMParam param) {
-        //各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
-        //获取部门id集合
-        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        //指标对象类型属性
-        DictData harmonicDate =null;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
-                , "各单位或者指标类型为空,请检查入参是否准确");
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //初始化对象
-        List<RIconVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicOrgQ> rStatHarmonicVoltageMS = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
-                .eq(RStatHarmonicOrgQ::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgQ::getOrgNo,deptIds)
-                .eq(RStatHarmonicOrgQ::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime())
-        );
-        //将数据转换为map进行便利
-        Map<String, List<RStatHarmonicOrgQ>> voltageMMap = rStatHarmonicVoltageMS.stream()
-                .collect(Collectors.groupingBy(RStatHarmonicOrgQ::getOrgNo));
-        //对象
-        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
-            voltageMMap.forEach((key, value) -> {
-                if(deptMap.containsKey(key)){
-                    DeptDTO data = deptMap.get(key);
-                    for (RStatHarmonicOrgQ orgQ : value) {
-                        RIconVO rIconVO = new RIconVO();
-                        rIconVO.setRowName(data.getName());
-//                    rIconVO.setSort(data.getSort());
-                        rIconVO.setOverLimitMeasurementAccrued(orgQ.getOverLimitMeasurementAccrued());
-                        rIconVO.setOverLimitMeasurementAverage(orgQ.getOverLimitMeasurementAverage());
-                        rIconVO.setOverLimitMeasurementRatioAccrued(orgQ.getOverLimitMeasurementRatioAccrued());
-                        rIconVO.setOverLimitMeasurementRatioAverage(orgQ.getOverLimitMeasurementRatioAverage());
-                        rIconVO.setAverageOverDay(orgQ.getAverageOverDay());
-                        arrayVOList.add(rIconVO);
-                    }
-
-                }
-            });
-        }
-        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
-        return arrayVOList;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java
deleted file mode 100644
index 5513a49a4..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
-import com.njcn.harmonic.mapper.StatHarmonicOrgYMapper;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RIconVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicOrgYService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-14
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMapper, RStatHarmonicOrgY> implements RStatHarmonicOrgYService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-    private final DeptFeignClient deptFeignClient;
-    private final StatHarmonicOrgYMapper statHarmonicOrgYMapper;
-
-    @Override
-    public List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
-        //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
-                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicOrgY> list = statHarmonicOrgYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgY>()
-                .eq(RStatHarmonicOrgY::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgY::getOrgNo,deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgY::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgY::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicMVO> rm=new ArrayList<>();
-        for (DeptDTO deptDTO : deptDTOList) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(deptDTO.getName());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setColumns(rm);
-            r.setSort(lineTypeDatum.getSort());
-            arrayVOList.add(r);
-        }
-        //根据检测点对象分组
-        Map<String, List<RStatHarmonicOrgY>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgY::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-            if(lineTypeMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b=new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicOrgY orgY : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
-                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
-                    if (ObjectUtil.isNotNull(data1)){
-                        r.setHarmonicName(data1.getName());
-                        r.setOverDay(0);
-                        b.add(r);
-                    }
-                }
-                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-
-        });
-        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
-        return aa;
-    }
-
-    @Override
-    public List<RIconVO> getRStatHarmonicOrgYIcon(RStatHarmonicMParam param) {
-        //各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
-        //获取部门id集合
-        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        //指标对象类型属性
-        DictData harmonicDate =null;
-        //判断是是否传入检测点信息值（电压）
-        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
-            //指标对象类型
-            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
-            harmonicDate =indicatorTypeDate.get(0);
-        }else{
-            //获取指标对象（频率偏差）
-            harmonicDate= dicDataFeignClient.getDicDataById(
-                    param.getStasisID()).getData();
-        }
-        //反防止参数查询数据报错
-        Assert.isTrue(
-                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
-                , "各单位或者指标类型为空,请检查入参是否准确");
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //初始化对象
-        List<RIconVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicOrgY> rStatHarmonicVoltageMS = statHarmonicOrgYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgY>()
-                .eq(RStatHarmonicOrgY::getDataType,mainnetData.getId())
-                .in(RStatHarmonicOrgY::getOrgNo,deptIds)
-                .eq(RStatHarmonicOrgY::getHarmonicType, harmonicDate.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgY::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgY::getDataDate, param.getEndTime())
-        );
-        //将数据转换为map进行便利
-        Map<String, List<RStatHarmonicOrgY>> voltageMMap = rStatHarmonicVoltageMS.stream()
-                .collect(Collectors.groupingBy(RStatHarmonicOrgY::getOrgNo));
-        //对象
-        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
-            voltageMMap.forEach((key, value) -> {
-                if(deptMap.containsKey(key)){
-                    DeptDTO data = deptMap.get(key);
-                    for (RStatHarmonicOrgY orgY : value) {
-                        RIconVO rIconVO = new RIconVO();
-                        rIconVO.setRowName(data.getName());
-//                    rIconVO.setSort(data.getSort());
-                        rIconVO.setOverLimitMeasurementAccrued(orgY.getOverLimitMeasurementAccrued());
-                        rIconVO.setOverLimitMeasurementAverage(orgY.getOverLimitMeasurementAverage());
-                        rIconVO.setOverLimitMeasurementRatioAccrued(orgY.getOverLimitMeasurementRatioAccrued());
-                        rIconVO.setOverLimitMeasurementRatioAverage(orgY.getOverLimitMeasurementRatioAverage());
-                        rIconVO.setAverageOverDay(orgY.getAverageOverDay());
-                        arrayVOList.add(rIconVO);
-                    }
-
-                }
-            });
-        }
-        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
-        return arrayVOList;
-    }
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java
deleted file mode 100644
index da9adc57f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-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.harmonic.mapper.RStatHarmonicQMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
-import com.njcn.harmonic.pojo.po.RStatHarmonicY;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicQService;
-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 lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper, RStatHarmonicQ> implements RStatHarmonicQService {
-
-    private final RStatHarmonicQMapper rStatHarmonicQMapper;
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
-        //子节点 获取所有得干扰源类型（监测点类型）
-        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //对象主节点 获取所有得指标类型
-        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicQ> list = rStatHarmonicQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicQ>()
-                .eq(RStatHarmonicQ::getDataType,mainnetData.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicQ::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicQ::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        List<RStatHarmonicMVO> rm=new ArrayList<>();
-        for (DictData lineTypeDatum : interferenceSourceTypeData) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(lineTypeDatum.getName());
-            r.setSort(lineTypeDatum.getSort());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setSort(lineTypeDatum.getSort());
-            r.setColumns(rm);
-            arrayVOList.add(r);
-        }
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicQ>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-
-            if(lineTypeMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b=new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicQ rStatHarmonicQ : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicQ, RStatHarmonicMVO.class);
-                    DictData data1 = interferenceMap.get(rStatHarmonicQ.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    r.setOverDay(0);
-                    b.add(r);
-                }
-                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-
-        });
-        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return aa;
-    }
-
-    @Override
-    public List<RArrayVO> getPwRStatHarmonicQAll(StatisticsBizBaseParam param) {
-        //对象主节点 获取所有的稳态类型
-        List<DictData> eventData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> eventMap = eventData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //子节点获取监测点类别
-        List<DictData> lineData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.LINE_SORT.getCode()).getData();
-        Map<String, DictData> lineMap = lineData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //获取配网id信息
-        DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList=new ArrayList<>();
-        //数据库查询
-        List<RStatHarmonicQ> list = rStatHarmonicQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicQ>()
-                .eq(RStatHarmonicQ::getDataType,distributionData.getId())
-                .ge(param.getStartTime()!=null, RStatHarmonicQ::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicQ::getDataDate, param.getEndTime()));
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicQ>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getHarmonicType));
-        //重新生成数据结构
-        measurementMap.forEach((key, value) -> {
-            List<RStatHarmonicMVO> eventVO=new ArrayList<>();
-            if(eventMap.containsKey(key)){
-                RArrayVO arrayVO=new RArrayVO();
-                DictData data = eventMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                for (RStatHarmonicQ statHarmonic : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(statHarmonic, RStatHarmonicMVO.class);
-                    DictData data1 = lineMap.get(statHarmonic.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    eventVO.add(r);
-                }
-                //根据监测点类别获取差集
-                Map<String, List<RStatHarmonicQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getMeasurementTypeClass));
-                List<DictData> differenceList = lineData.stream().filter(r -> !listMap.containsKey(r.getId()))
-                        .collect(Collectors.toList());
-                this.assignDict(differenceList, eventVO, arrayVO);
-                arrayVO.setColumns(eventVO);
-                eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-                arrayVOList.add(arrayVO);
-            }
-        });
-        //处理主节点不存在的集合
-        List<DictData> notMeasurementList = eventData.stream().filter(r -> !measurementMap.containsKey(r.getId()))
-                .collect(Collectors.toList());
-        for (DictData notData : notMeasurementList) {
-            List<RStatHarmonicMVO> statharmonicVO=new ArrayList<>();
-            RArrayVO arrayVO=new RArrayVO();
-            arrayVO.setRowName(notData.getName());
-            arrayVO.setSort(notData.getSort());
-            this.assignDict(lineData, statharmonicVO, arrayVO);
-            statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-            arrayVOList.add(arrayVO);
-        }
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return arrayVOList;
-    }
-
-    /**
-     * 便利赋值
-     * @param DictDataList 稳态指标类型集合
-     * @param statharmonicVO   暂态监测点
-     * @param arrayVO   初始化对象
-     */
-    private void assignDict(List<DictData> DictDataList, List<RStatHarmonicMVO> statharmonicVO, RArrayVO arrayVO) {
-        for (DictData dictData : DictDataList) {
-            RStatHarmonicMVO notStatHarmonicVO=new RStatHarmonicMVO();
-            notStatHarmonicVO.setHarmonicName(dictData.getName());
-            notStatHarmonicVO.setSort(dictData.getSort());
-            notStatHarmonicVO.setOverLimitMeasurementAverage(0);
-            notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
-            notStatHarmonicVO.setOverDay(0);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAccrued(0.0F);
-            notStatHarmonicVO.setAverageOverDay(0.0F);
-            statharmonicVO.add(notStatHarmonicVO);
-        }
-        arrayVO.setColumns(statharmonicVO);
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java
deleted file mode 100644
index b6d267913..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-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.harmonic.mapper.RStatHarmonicYMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicY;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
-import com.njcn.harmonic.service.RStatHarmonicYService;
-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 lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-12
- */
-@Service
-@RequiredArgsConstructor
-public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper, RStatHarmonicY> implements RStatHarmonicYService {
-
-    private final RStatHarmonicYMapper rStatHarmonicYMapper;
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
-        //子节点 获取所有得干扰源类型（监测点类型）
-        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //对象主节点 获取所有得指标类型
-        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
-                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> lineTypeMap = lineTypeData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatHarmonicY> list = rStatHarmonicYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicY>()
-                .eq(RStatHarmonicY::getDataType, mainnetData.getId())
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicY::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicY::getDataDate, param.getEndTime()));
-
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList = new ArrayList<>();
-
-
-        List<RStatHarmonicMVO> rm = new ArrayList<>();
-        for (DictData lineTypeDatum : interferenceSourceTypeData) {
-            RStatHarmonicMVO r = new RStatHarmonicMVO();
-            r.setHarmonicName(lineTypeDatum.getName());
-            r.setSort(lineTypeDatum.getSort());
-            r.setOverLimitMeasurementAverage(0);
-            r.setOverLimitMeasurementAccrued(0);
-            r.setAverageOverDay(0.0F);
-            r.setOverDay(0);
-            r.setOverLimitMeasurementRatioAverage(0.0F);
-            r.setOverLimitMeasurementRatioAccrued(0.0F);
-            rm.add(r);
-        }
-        for (DictData lineTypeDatum : lineTypeData) {
-            RArrayVO r = new RArrayVO();
-            r.setRowName(lineTypeDatum.getName());
-            r.setColumns(rm);
-            r.setSort(lineTypeDatum.getSort());
-            arrayVOList.add(r);
-        }
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicY>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType));
-        //重新生成数据结构
-        MeasurementTypeClassMap.forEach((key, value) -> {
-            if (lineTypeMap.containsKey(key)) {
-                RArrayVO arrayVO = new RArrayVO();
-                DictData data = lineTypeMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                List<RStatHarmonicMVO> b = new ArrayList<>();
-                b.addAll(rm);
-                for (RStatHarmonicY rStatHarmonicY : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicY, RStatHarmonicMVO.class);
-                    DictData data1 = interferenceMap.get(rStatHarmonicY.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    r.setOverDay(0);
-                    b.add(r);
-                }
-                Map<String, RStatHarmonicMVO> linkedHashMap = new LinkedHashMap<>();
-                for (RStatHarmonicMVO harmonicMVO : b) {
-                    linkedHashMap.put(harmonicMVO.getHarmonicName(), harmonicMVO);
-                }
-                List<RStatHarmonicMVO> aa = new ArrayList<>(linkedHashMap.values());
-                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
-                arrayVO.setColumns(aa);
-                arrayVOList.add(arrayVO);
-            }
-
-        });
-        Map<String, RArrayVO> linkedHashMap = new LinkedHashMap<>();
-        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
-            linkedHashMap.put(rStatHarmonicMVO.getRowName(), rStatHarmonicMVO);
-        }
-        List<RArrayVO> aa = new ArrayList<>(linkedHashMap.values());
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return aa;
-    }
-
-    @Override
-    public List<RArrayVO> getPwRStatHarmonicYAll(StatisticsBizBaseParam param) {
-        //对象主节点 获取所有的稳态类型
-        List<DictData> eventData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        Map<String, DictData> eventMap = eventData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //子节点获取监测点类别
-        List<DictData> lineData = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.LINE_SORT.getCode()).getData();
-        Map<String, DictData> lineMap = lineData.stream()
-                .collect(Collectors.toMap(DictData::getId, Function.identity()));
-
-        //获取配网id信息
-        DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
-        //初始化指标类型（横向）
-        List<RArrayVO> arrayVOList = new ArrayList<>();
-        //数据库查询
-        List<RStatHarmonicY> list = rStatHarmonicYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicY>()
-                .eq(RStatHarmonicY::getDataType, distributionData.getId())
-                .ge(param.getStartTime() != null, RStatHarmonicY::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicY::getDataDate, param.getEndTime()));
-        //根据稳态指标分组
-        Map<String, List<RStatHarmonicY>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType));
-        //重新生成数据结构
-        measurementMap.forEach((key, value) -> {
-            List<RStatHarmonicMVO> eventVO = new ArrayList<>();
-            if (eventMap.containsKey(key)) {
-                RArrayVO arrayVO = new RArrayVO();
-                DictData data = eventMap.get(key);
-                arrayVO.setRowName(data.getName());
-                arrayVO.setSort(data.getSort());
-                for (RStatHarmonicY statHarmonic : value) {
-                    RStatHarmonicMVO r = BeanUtil.copyProperties(statHarmonic, RStatHarmonicMVO.class);
-                    DictData data1 = lineMap.get(statHarmonic.getMeasurementTypeClass());
-                    r.setHarmonicName(data1.getName());
-                    r.setSort(data1.getSort());
-                    eventVO.add(r);
-                }
-                //根据监测点类别获取差集
-                Map<String, List<RStatHarmonicY>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicY::getMeasurementTypeClass));
-                List<DictData> differenceList = lineData.stream().filter(r -> !listMap.containsKey(r.getId()))
-                        .collect(Collectors.toList());
-                this.assignDict(differenceList, eventVO, arrayVO);
-                arrayVO.setColumns(eventVO);
-                eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-                arrayVOList.add(arrayVO);
-            }
-        });
-        //处理主节点不存在的集合
-        List<DictData> notMeasurementList = eventData.stream().filter(r -> !measurementMap.containsKey(r.getId()))
-                .collect(Collectors.toList());
-        for (DictData notData : notMeasurementList) {
-            List<RStatHarmonicMVO> statharmonicVO = new ArrayList<>();
-            RArrayVO arrayVO = new RArrayVO();
-            arrayVO.setRowName(notData.getName());
-            arrayVO.setSort(notData.getSort());
-            this.assignDict(lineData, statharmonicVO, arrayVO);
-            statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
-            arrayVOList.add(arrayVO);
-        }
-        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
-        return arrayVOList;
-    }
-
-    /**
-     * 便利赋值
-     *
-     * @param DictDataList   稳态指标类型集合
-     * @param statharmonicVO 暂态监测点
-     * @param arrayVO        初始化对象
-     */
-    private void assignDict(List<DictData> DictDataList, List<RStatHarmonicMVO> statharmonicVO, RArrayVO arrayVO) {
-        for (DictData dictData : DictDataList) {
-            RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
-            notStatHarmonicVO.setHarmonicName(dictData.getName());
-            notStatHarmonicVO.setSort(dictData.getSort());
-            notStatHarmonicVO.setOverLimitMeasurementAverage(0);
-            notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
-            notStatHarmonicVO.setOverDay(0);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);
-            notStatHarmonicVO.setOverLimitMeasurementRatioAccrued(0.0F);
-            notStatHarmonicVO.setAverageOverDay(0.0F);
-            statharmonicVO.add(notStatHarmonicVO);
-        }
-        arrayVO.setColumns(statharmonicVO);
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java
deleted file mode 100644
index 81ab5b67d..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.mapper.*;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.*;
-import com.njcn.harmonic.pojo.vo.RArrayVO;
-import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.service.RStatLoadTypeService;
-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 org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-@Service
-@RequiredArgsConstructor
-public class RStatLoadTypeServiceImpl extends ServiceImpl<RStatLoadTypeMMapper, RStatLoadTypeM> implements RStatLoadTypeService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final RStatLoadTypeYMapper rStatLoadTypeYMapper;
-    private final RStatLoadTypeQMapper rStatLoadTypeQMapper;
-    private final RStatLoadTypeMMapper rStatLoadTypeMMapper;
-
-    @Override
-    public List<RArrayVO> getRStatLoadType(StatisticsBizBaseParam param) {
-        //获取部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        //获取字典信息
-        List<DictData> data1 = dicDataFeignClient.getDicDataByTypeCode(
-                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
-        List<DictData> dictData = data1.stream().filter(dictdatas -> dictdatas.getLevel() == 1).collect(Collectors.toList());
-        dictData.sort(Comparator.comparing(r -> r.getSort()));
-        //初始化对象
-        List<RArrayVO> info = new ArrayList<>();
-        List<RStatLoadTypeVO> temp = new ArrayList<>();
-        //根据部门进行筛选
-        StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-        baseParam.setIds(deptIds);
-        if (CollectionUtil.isNotEmpty(data)) {
-            // 类型（1年 2季度 3月份
-            switch (param.getType().toString()) {
-                case BizParamConstant.STAT_BIZ_YEAR:
-                    // 获取年区域暂态指标分类统计表
-                    temp = rStatLoadTypeYMapper.getYearStatLoadType(baseParam);
-                    break;
-                case BizParamConstant.STAT_BIZ_QUARTER:
-                    // 获取季区域暂态指标分类统计表
-                    temp = rStatLoadTypeQMapper.getQuarterStatLoadType(baseParam);
-                    break;
-                case BizParamConstant.STAT_BIZ_MONTH:
-                    // 获取月区域暂态指标分类统计表
-                    temp = rStatLoadTypeMMapper.getMonthStatLoadType(baseParam);
-                    break;
-                default:
-                    break;
-
-            }
-            // 匹配单位名称
-            for (DeptDTO dto : data) {
-                for (RStatLoadTypeVO vo : temp) {
-                    if (dto.getId().equals(vo.getOrgNo())) {
-                        vo.setOrgName(dto.getName());
-                    }
-                }
-            }
-            //根据部门id进行分组
-            Map<String, List<RStatLoadTypeVO>> map = temp
-                    .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo));
-            map.forEach((key, value) -> {
-                RArrayVO arrayVO = new RArrayVO();
-                arrayVO.setRowName(value.get(0).getOrgName());
-                //属性赋值监测点名称
-                for (DictData dictDatum : dictData) {
-                    for (RStatLoadTypeVO rStatLoadTypeVO : value) {
-                        if (dictDatum.getId().equals(rStatLoadTypeVO.getLoadType())) {
-                            rStatLoadTypeVO.setLoadName(dictDatum.getName());
-                            rStatLoadTypeVO.setSort(dictDatum.getSort());
-
-                        }
-                    }
-                }
-                //获取差集（数据在字典里面没有的集合）
-                Map<String, List<RStatLoadTypeVO>> listMap = value.stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getLoadType));
-                List<DictData> differenceList = dictData.stream().filter(r -> !listMap.containsKey(r.getId()))
-                        .collect(Collectors.toList());
-                for (DictData data4 : differenceList) {
-                    RStatLoadTypeVO vo = new RStatLoadTypeVO();
-                    vo.setSort(data4.getSort());
-                    vo.setOrgNo(key);
-                    vo.setOrgName(value.get(0).getOrgName());
-                    vo.setLoadType(data4.getId());
-                    vo.setLoadName(data4.getName());
-                    vo.setVAverage(0.0f);
-                    vo.setVAccrued(0.0f);
-                    vo.setIAverage(0.0f);
-                    vo.setIAccrued(0.0f);
-                    vo.setUnbalanceAverage(0.0f);
-                    vo.setUnbalanceAccrued(0.0f);
-                    vo.setINegAverage(0.0f);
-                    vo.setINegAccrued(0.0f);
-                    vo.setFlickerAverage(0.0f);
-                    vo.setFlickerAccrued(0.0f);
-                    value.add(vo);
-                }
-                value.sort(Comparator.comparing(r -> r.getSort()));
-                arrayVO.setColumns(value);
-                info.add(arrayVO);
-            });
-        }
-        return info;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java
deleted file mode 100644
index 156b452e7..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.device.pms.api.PmsGeneratrixClient;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
-import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageQMapper;
-import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageYMapper;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
-import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageMMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
-import com.njcn.harmonic.service.RStatOrgBusbarVoltageService;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.dto.DeptDTO;
-import com.njcn.web.utils.WebUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-19
- */
-@Service
-@RequiredArgsConstructor
-public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbarVoltageMMapper, RStatOrgBusbarVoltageM> implements RStatOrgBusbarVoltageService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final RStatOrgBusbarVoltageYMapper rStatOrgBusbarVoltageYMapper;
-    private final RStatOrgBusbarVoltageQMapper rStatOrgBusbarVoltageQMapper;
-    private final RStatOrgBusbarVoltageMMapper rStatOrgBusbarVoltageMMapper;
-    private final PmsGeneratrixClient pmsGeneratrixClient;
-
-    @Override
-    public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) {
-        //获取部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        Map<String, DeptDTO> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
-
-        //获取部门id集合
-        List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        List<RStatOrgBusbarVoltageVO> info = new ArrayList<>();
-        List<RStatOrgBusbarVoltageVO> temp = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(data)) {
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(deptIds);
-            // 类型（1年 2季度 3月份)
-            switch (param.getType().toString()) {
-                case BizParamConstant.STAT_BIZ_YEAR:
-                    // 获取年区域电站母线电压类指标超标计
-                    temp = rStatOrgBusbarVoltageYMapper.getYstatOrgBusbarVoltageVO(baseParam);
-                    break;
-                case BizParamConstant.STAT_BIZ_QUARTER:
-                    // 获取季区域电站母线电压类指标超标计
-                    temp = rStatOrgBusbarVoltageQMapper.getQstatOrgBusbarVoltageVO(baseParam);
-                    break;
-                case BizParamConstant.STAT_BIZ_MONTH:
-                    // 获取月区域电站母线电压类指标超标计
-                    temp = rStatOrgBusbarVoltageMMapper.getMstatOrgBusbarVoltageVO(baseParam);
-                    break;
-                default:
-                    break;
-            }
-        }
-        if (CollectionUtil.isNotEmpty(temp)) {
-            //获取母线集合
-            List<String> busbarIds = temp.stream().map(RStatOrgBusbarVoltageVO::getBusbarId).collect(Collectors.toList());
-            PmsGeneratrixParam generatrixParam=new PmsGeneratrixParam();
-            generatrixParam.setGeneratrixIds(busbarIds);
-            generatrixParam.setGeneratrixVoltageLevel(param.getIds());
-            List<GeneratrixAndPowerStationDTO> generatrixDTO = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(generatrixParam).getData();
-            Map<String, GeneratrixAndPowerStationDTO> generatrixMap = generatrixDTO.stream().collect(
-                    Collectors.toMap(GeneratrixAndPowerStationDTO::getGeneratrixId, Function.identity()));
-            Map<String, RStatOrgBusbarVoltageVO> orgMap = temp.stream().collect(Collectors.toMap(RStatOrgBusbarVoltageVO::getOrgNo, Function.identity()));
-            orgMap.forEach((key, value) -> {
-                if (deptMap.containsKey(key)) {
-                    DeptDTO deptDTO = deptMap.get(key);
-                    value.setOrgName(deptDTO.getName());
-                    if(generatrixMap.containsKey(value.getBusbarId())){
-                        GeneratrixAndPowerStationDTO dto = generatrixMap.get(value.getBusbarId());
-                        value.setBusbarVoltageLevel(dto.getGeneratrixVoltageLevel());
-                        value.setPowerStationName(dto.getPowerName());
-                        info.add(value);
-                    }
-                }
-            });
-        }
-        return info;
-    }
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java
deleted file mode 100644
index 1525ede8f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgM;
-import com.njcn.harmonic.mapper.RStatOrgMMapper;
-import com.njcn.harmonic.pojo.po.RStatOrgQ;
-import com.njcn.harmonic.pojo.vo.RStatOrgVO;
-import com.njcn.harmonic.service.RStatOrgMService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataEnum;
-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.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 区域分类统计月表 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-@Service
-@RequiredArgsConstructor
-public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM> implements RStatOrgMService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final RStatOrgMMapper rStatOrgMMapper;
-
-    @Override
-    public List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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()));
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-        //数据库查询
-        List<RStatOrgM> list = rStatOrgMMapper.selectList(new LambdaQueryWrapper<RStatOrgM>()
-                .eq(RStatOrgM::getDataType, mainnetData.getId())
-                .in(RStatOrgM::getOrgNo, deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgM::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgM::getDataDate, param.getEndTime()));
-        Map<String, List<RStatOrgM>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgM::getOrgNo));
-
-        List<RStatOrgVO> newList = new ArrayList<>();
-        collect.forEach((key, value) -> {
-            if (deptMap.containsKey(key)) {
-                for (RStatOrgM rStatOrgM : value) {
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    DeptDTO deptDTO = deptMap.get(key);
-                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
-                    rStatOrgVO.setOrgName(deptDTO.getName());
-                    Float averageOverDay = Float.parseFloat(
-                            df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setAverageOverDay(averageOverDay);
-                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
-                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
-                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
-                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued());
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
-                    newList.add(rStatOrgVO);
-                }
-            }
-        });
-        return newList;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java
deleted file mode 100644
index fc59524c8..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgQ;
-import com.njcn.harmonic.mapper.RStatOrgQMapper;
-import com.njcn.harmonic.pojo.vo.RStatOrgVO;
-import com.njcn.harmonic.service.RStatOrgQService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataEnum;
-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.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 区域分类统计季表 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-@Service
-@RequiredArgsConstructor
-public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ> implements RStatOrgQService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final RStatOrgQMapper rStatOrgQMapper;
-
-    @Override
-    public List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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()));
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatOrgQ> list = rStatOrgQMapper.selectList(new LambdaQueryWrapper<RStatOrgQ>()
-                .eq(RStatOrgQ::getDataType, mainnetData.getId())
-                .in(RStatOrgQ::getOrgNo, deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgQ::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgQ::getDataDate, param.getEndTime()));
-        Map<String, List<RStatOrgQ>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgQ::getOrgNo));
-
-        List<RStatOrgVO> newList = new ArrayList<>();
-        collect.forEach((key, value) -> {
-            if (deptMap.containsKey(key)) {
-                for (RStatOrgQ rStatOrgQ : value) {
-                    DeptDTO deptDTO = deptMap.get(key);
-                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
-                    rStatOrgVO.setOrgName(deptDTO.getName());
-                    rStatOrgVO.setAverageOverDay(rStatOrgQ.getAverageOverDay());
-                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgQ.getEffectiveMeasurementAverage());
-                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgQ.getEffectiveMeasurementAccrued());
-                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
-                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued());
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
-                    newList.add(rStatOrgVO);
-                }
-            }
-        });
-        return newList;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java
deleted file mode 100644
index d7a55d58f..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.MonitorClient;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.api.StatationStatClient;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
-import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.pojo.param.PmsMonitorParam;
-import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
-import com.njcn.harmonic.mapper.*;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatOrgY;
-import com.njcn.harmonic.pojo.vo.*;
-import com.njcn.harmonic.service.RStatOrgYService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 区域分类统计年表 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-17
- */
-@Service
-@RequiredArgsConstructor
-public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY> implements RStatOrgYService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final RStatOrgYMapper rStatOrgYMapper;
-    private final RStatOrgQMapper rStatOrgQMapper;
-    private final RStatOrgMMapper rStatOrgMMapper;
-    private final RStatSubstationMMapper rStatSubstationMMapper;
-    private final RStatSubstationQMapper rStatSubstationQMapper;
-    private final RStatSubstationYMapper rStatSubstationYMapper;
-    private final MonitorClient monitorClient;
-    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
-
-    @Override
-    public List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).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()));
-
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        //数据库查询
-        List<RStatOrgY> list = rStatOrgYMapper.selectList(new LambdaQueryWrapper<RStatOrgY>()
-                .eq(RStatOrgY::getDataType, mainnetData.getId())
-                .in(RStatOrgY::getOrgNo, deptIds)
-                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgY::getDataDate, param.getStartTime())
-                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgY::getDataDate, param.getEndTime()));
-        Map<String, List<RStatOrgY>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgY::getOrgNo));
-
-        List<RStatOrgVO> newList = new ArrayList<>();
-        collect.forEach((key, value) -> {
-            if (deptMap.containsKey(key)) {
-                for (RStatOrgY rStatOrgY : value) {
-                    DeptDTO deptDTO = deptMap.get(key);
-                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
-                    rStatOrgVO.setOrgName(deptDTO.getName());
-                    rStatOrgVO.setAverageOverDay(rStatOrgY.getAverageOverDay());
-                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgY.getEffectiveMeasurementAverage());
-                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgY.getEffectiveMeasurementAccrued());
-                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());
-                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued());
-                    DecimalFormat df = new DecimalFormat("###.00");
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
-                    newList.add(rStatOrgVO);
-                }
-            }
-        });
-        return newList;
-    }
-
-    @Override
-    public List<RStatSubstationOrg2VO> getRStatSubstationOrg(StatisticsBizBaseParam param) {
-        // 获取当前用户的部门的子部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        List<RStatSubstationOrg2VO> info = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(data)) {
-            // 根据暂态指标枚举查询暂态指标
-            List<DictData> eventStatis = dicDataFeignClient.getDicDataByTypeCode(
-                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-            List<RStatSubstationOrgVO> temp = new ArrayList<>();
-            // 过滤出部门id
-            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(deptIds);
-            //获取主网id信息
-            DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-            // 类型（1年 2季度 3月份 4日
-            switch (param.getType().toString()) {
-                case BizParamConstant.STAT_BIZ_YEAR:
-                    // 获取年区域暂态指标分类统计表
-                    temp = rStatOrgYMapper.getYearRStatHarmonicOrgInfo(baseParam, mainnetData.getId());
-                    break;
-                case BizParamConstant.STAT_BIZ_QUARTER:
-                    // 获取季区域暂态指标分类统计表
-                    temp = rStatOrgQMapper.getQuarterRStatHarmonicOrgInfo(baseParam, mainnetData.getId());
-                    break;
-                case BizParamConstant.STAT_BIZ_MONTH:
-                    // 获取月区域暂态指标分类统计表
-                    temp = rStatOrgMMapper.getMonthRStatHarmonicOrgInfo(baseParam, mainnetData.getId());
-                    break;
-                default:
-                    break;
-            }
-            Map<String, List<RStatSubstationOrgVO>> map = temp
-                    .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo));
-            map.forEach((key, value) -> {
-                RStatSubstationOrg2VO vo = new RStatSubstationOrg2VO();
-                vo.setOrgNo(value.get(0).getOrgNo());
-                vo.setOrgName(value.get(0).getOrgName());
-                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 : eventStatis) {
-                        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);
-            });
-            // 匹配单位名称
-            for (DeptDTO dto : data) {
-                for (RStatSubstationOrg2VO vo : info) {
-                    if (dto.getId().equals(vo.getOrgNo())) {
-                        vo.setOrgName(dto.getName());
-                    }
-                }
-            }
-        }
-        return info;
-    }
-
-    @Override
-    public List<RSubstationIcon2VO.RSubstationInfoVO> getRStatSubstation(StatSubstationBizBaseParam param) {
-        PmsDeviceInfoParam pms = new PmsDeviceInfoParam();
-        pms.setDeptIndex(param.getId());
-        pms.setStatisticalType(new SimpleDTO());
-        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
-        //生成变电站id集合
-        List<String> pAddIds = new ArrayList<>();
-        data.stream().forEach(e -> pAddIds.addAll(e.getPowerrIdList()));
-        List<RSubstationIcon2VO> rSubstationIconVO = new ArrayList<>();
-        //根据监测点id获取变电站信息
-        PmsMonitorParam dto = new PmsMonitorParam();
-        List<String> mAddIds = new ArrayList<>();
-        data.stream().forEach(e -> mAddIds.addAll(e.getMonitorIdList()));
-        dto.setMonitorIds(mAddIds);
-        dto.setPowerrIds(param.getIds());
-        //根据变电站分组
-        List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
-        Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
-                .collect(Collectors.toMap(PmsMonitorDTO::getPowerrId, Function.identity()));
-
-        if (CollUtil.isNotEmpty(pmsMonitorDTOS)) {
-            //获取最新过滤的变电站id
-            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getPowerrId).collect(Collectors.toList());
-            //根据id进行筛选
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(ids);
-            String string = param.getType().toString();
-            switch (string) {
-                //查询变电站稳态指标平均超标天数-年数据
-                case BizParamConstant.STAT_BIZ_YEAR:
-                    rSubstationIconVO = rStatSubstationYMapper.getStatSubstationIcon2Y(baseParam);
-                    break;
-                //查询变电站稳态指标平均超标天数-季数据
-                case BizParamConstant.STAT_BIZ_QUARTER:
-                    rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIcon2Q(baseParam);
-                    break;
-                //查询变电站稳态指标平均超标天数-月数据
-                case BizParamConstant.STAT_BIZ_MONTH:
-                    rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIcon2M(baseParam);
-                    break;
-                default:
-                    break;
-            }
-            List<RSubstationIcon2VO.RSubstationInfoVO> rSubstationInfoVOS = BeanUtil.copyToList(rSubstationIconVO, RSubstationIcon2VO.RSubstationInfoVO.class);
-            if (CollectionUtil.isNotEmpty(rSubstationInfoVOS)) {
-                Map<String, RSubstationIcon2VO.RSubstationInfoVO> detailVOMap = rSubstationInfoVOS.stream()
-                        .collect(Collectors.toMap(RSubstationIcon2VO.RSubstationInfoVO::getSubstationId, Function.identity()));
-                detailVOMap.forEach((Key, value) -> {
-                    if (pmsMonitorDTOMap.containsKey(Key)) {
-                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
-                        value.setCityName(dto1.getOrgName());
-                        value.setSubstationName(dto1.getPowerrName());
-                    }
-                });
-            }
-            return rSubstationInfoVOS;
-        }
-        return null;
-    }
-
-    @Override
-    public List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getRStatOrgIndex(StatisticsBizBaseParam param) {
-        // 获取当前用户的部门的子部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        List<RStatOrgIndexVO.RStatOrgIndexInfoVO> info = new ArrayList<>();
-        //获取主网id信息
-        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
-
-        if (CollectionUtil.isNotEmpty(data)) {
-            // 过滤出部门id
-            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
-            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-            baseParam.setIds(deptIds);
-            // 类型（1年 2季度 3月份 4日
-            switch (param.getType().toString()) {
-                case BizParamConstant.STAT_BIZ_YEAR:
-                    // 获取年区域稳态指标合格率统计表
-                    info = rStatOrgYMapper.getYearRStatOrgIndex(baseParam, mainnetData.getId());
-                    break;
-                case BizParamConstant.STAT_BIZ_QUARTER:
-                    // 获取季区域稳态指标合格率统计表
-                    info = rStatOrgQMapper.getQuarterRStatOrgIndex(baseParam, mainnetData.getId());
-                    break;
-                case BizParamConstant.STAT_BIZ_MONTH:
-                    // 获取月区域稳态指标合格率统计表
-                    info = rStatOrgMMapper.getMonthRStatOrgIndex(baseParam, mainnetData.getId());
-                    break;
-                default:
-                    break;
-            }
-        }
-        //匹配名称
-        for (DeptDTO dto : data) {
-            for (RStatOrgIndexVO vo : info) {
-                if (dto.getId().equals(vo.getOrgNo())) {
-                    vo.setOrgNo(dto.getId());
-                    vo.setOrgName(dto.getName());
-                }
-            }
-        }
-        return info;
-    }
-
-
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java
deleted file mode 100644
index b2815b87c..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.api.StatationStatClient;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
-import com.njcn.harmonic.mapper.RStatSubstationQMapper;
-import com.njcn.harmonic.mapper.RStatSubstationYMapper;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationM;
-import com.njcn.harmonic.mapper.RStatSubstationMMapper;
-import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
-import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
-import com.njcn.harmonic.service.RStatSubstationMService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.user.api.DeptFeignClient;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-@Service
-@RequiredArgsConstructor
-public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMapper, RStatSubstationM> implements RStatSubstationMService {
-
-    private final RStatSubstationMMapper rStatSubstationMMapper;
-    private final RStatSubstationQMapper rStatSubstationQMapper;
-    private final RStatSubstationYMapper rStatSubstationYMapper;
-    private final StatationStatClient statationStatClient;
-    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
-
-    @Override
-    public RSubstationIconVO getStatSubstationIcon(StatisticsBizBaseParam param) {
-        RSubstationIconVO rSubstationIconVO = new RSubstationIconVO();
-        StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-        //根据部门获取变电站信息
-//        baseParam.setIds(this.powerrIdList(param.getId()));
-        String string = param.getType().toString();
-        switch (string) {
-            //查询变电站稳态指标超标分布（按超标天数）-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rSubstationIconVO = rStatSubstationYMapper.getStatSubstationIconY(baseParam);
-                break;
-            //查询变电站稳态指标超标分布（按超标天数）-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIconQ(baseParam);
-                break;
-            //查询变电站稳态指标超标分布（按超标天数）-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIconM(baseParam);
-                break;
-            default:
-                break;
-        }
-        return rSubstationIconVO;
-    }
-
-    @Override
-    public List<RSubstationIcon2VO> getStatSubstationIcon2(StatisticsBizBaseParam param) {
-        //生成变电站id集合
-        List<RSubstationIcon2VO> rSubstationIconVO = new ArrayList<>();
-        StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
-        //根据id进行筛选
-//        baseParam.setIds(this.powerrIdList(param.getId()));
-        String string = param.getType().toString();
-        switch (string) {
-            //查询变电站稳态指标平均超标天数-年数据
-            case BizParamConstant.STAT_BIZ_YEAR:
-                rSubstationIconVO = rStatSubstationYMapper.getStatSubstationIcon2Y(baseParam);
-                break;
-            //查询变电站稳态指标平均超标天数-季数据
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIcon2Q(baseParam);
-                break;
-            //查询变电站稳态指标平均超标天数-月数据
-            case BizParamConstant.STAT_BIZ_MONTH:
-                rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIcon2M(baseParam);
-                break;
-            default:
-                break;
-        }
-
-        //获取变电站名称属性替换
-        if (CollUtil.isNotEmpty(rSubstationIconVO)) {
-            List<String> ids = rSubstationIconVO.stream().map(RSubstationIcon2VO::getSubstationId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(ids)) {
-                PmsStatationStatInfoParam pmsParam = new PmsStatationStatInfoParam();
-                pmsParam.setPowerIds(ids);
-                List<PmsStatationStatInfoDTO> data1 = statationStatClient.getStatationStatInfo(pmsParam).getData();
-                if (CollUtil.isNotEmpty(data1)) {
-                    for (PmsStatationStatInfoDTO dto : data1) {
-                        for (RSubstationIcon2VO vo : rSubstationIconVO) {
-                            if (dto.getPowerId().equals(vo.getSubstationId())) {
-                                vo.setSubstationName(dto.getPowerName());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return rSubstationIconVO;
-    }
-
-    private List<String> powerrIdList(String id) {
-        //获取部门下面监测点信息
-        PmsDeviceInfoParam pms = new PmsDeviceInfoParam();
-        pms.setDeptIndex(id);
-        pms.setStatisticalType(new SimpleDTO());
-        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
-        List<String> addids = new ArrayList<>();
-        data.stream().forEach(e -> addids.addAll(e.getPowerrIdList()));
-        return addids;
-    }
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java
deleted file mode 100644
index ffbcdf2a8..000000000
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
-import com.njcn.harmonic.mapper.RStatSubstationVoltageMMapper;
-import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
-import com.njcn.harmonic.service.RStatSubstationVoltageMService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.user.api.DeptFeignClient;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author rui.wu
- * @since 2022-10-18
- */
-@Service
-@RequiredArgsConstructor
-public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstationVoltageMMapper, RStatSubstationVoltageM> implements RStatSubstationVoltageMService {
-
-    private final DeptFeignClient deptFeignClient;
-    private final RStatSubstationVoltageMMapper rStatSubstationVoltageMMapper;
-    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
-
-    @Override
-    public List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param) {
-        //获取部门id集合
-        StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
-//        baseParam.setIds(this.powerrIdList(param.getId()));
-        return rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam);
-    }
-    //根据部门获取监测点id信息
-    private List<String> powerrIdList(String id){
-        //获取部门下面监测点信息
-        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
-        pms.setDeptIndex(id);
-        pms.setStatisticalType(new SimpleDTO());
-        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
-        List<String> addids=new ArrayList<>();
-        data.stream().forEach(e-> addids.addAll(e.getPowerrIdList()));
-        return addids;
-    }
-}
diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml
index 4a93f8a33..3a137fbfd 100644
--- a/pqs-job/job-executor/pom.xml
+++ b/pqs-job/job-executor/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>harmonic-prepare</artifactId>
+            <artifactId>prepare-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/pqs-job/job-executor/src/main/resources/bootstrap.yml b/pqs-job/job-executor/src/main/resources/bootstrap.yml
index 022513965..b25768c57 100644
--- a/pqs-job/job-executor/src/main/resources/bootstrap.yml
+++ b/pqs-job/job-executor/src/main/resources/bootstrap.yml
@@ -46,8 +46,8 @@ logging:
 xxl:
   job:
     admin:
-#      addresses: http://198.120.100.195:10217/job-admin
-      addresses: http://192.168.1.29:10217/job-admin
+      addresses: http://198.120.100.195:10217/job-admin
+#      addresses: http://192.168.1.29:10217/job-admin
   #执行器通讯TOKEN [选填]：非空时启用；
     accessToken:
     executor:
diff --git a/pqs-prepare/harmonic-prepare/pom.xml b/pqs-prepare/harmonic-prepare/pom.xml
index 3fe999e2f..9b6700bcd 100644
--- a/pqs-prepare/harmonic-prepare/pom.xml
+++ b/pqs-prepare/harmonic-prepare/pom.xml
@@ -105,6 +105,12 @@
             <artifactId>common-minio</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>prepare-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
deleted file mode 100644
index 7417cf3dd..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/report",//对应controller请求类
-        fallbackFactory = CoustomReportFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface CoustmReportFeignClient {
-
-    /**
-     * 批量处理报表
-     * @author qijian
-     * @date 2022/10/19
-     */
-    @PostMapping("/batchReport")
-    HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
deleted file mode 100644
index ba9b051f7..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/daydata",//对应controller请求类
-        fallbackFactory = DayDataFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface DayDataFeignClient {
-
-    /**
-     * 批量处理报表
-     * @author qijian
-     * @date 2022/10/19
-     */
-    @PostMapping("/dayDataHanlder")
-    HttpResult<Boolean> dayDataHanlder(@RequestBody LineParam jobParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java
deleted file mode 100644
index 300711029..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 谐波畸变率
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/4 15:58
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,
-        path = "/distortion",
-        fallbackFactory = DistortionRateFeignClientFallbackFactory.class
-)
-public interface DistortionRateFeignClient {
-
-    @PostMapping("/distortionRate")
-    HttpResult<String> distortionRate(@RequestBody @Validated LineParam lineParam);
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java
deleted file mode 100644
index 783fef079..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 稳态综合评估
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/7 15:11
- */
-
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,
-        path = "/general",
-        fallbackFactory = DistortionRateFeignClientFallbackFactory.class
-)
-public interface HarmonicGeneralFeignClient {
-
-    @PostMapping("/generalData")
-    HttpResult<String> generalData(@RequestBody @Validated LineParam lineParam);
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java
deleted file mode 100644
index 9733f79de..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.HarmonicMetricFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/7 15:12
- */
-
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,
-        path = "/metric",
-        fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class
-)
-public interface HarmonicMetricFeignClient {
-
-    @PostMapping("/metricData")
-    HttpResult<String> metricData(@RequestBody @Validated LineParam lineParam);
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
deleted file mode 100644
index d0bfd73a4..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.IntegrityFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/integrity",//对应controller请求类
-        fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface IntegrityFeignClient {
-
-    /**
-     * 批量处理报表
-     * @author qijian
-     * @date 2022/10/19
-     */
-    @PostMapping("/computeDataIntegrity")
-    HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
deleted file mode 100644
index 51341caa4..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/limitTarget",//对应controller请求类
-        fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface LimitTargetFeignClient {
-
-    /**
-     * 批量处理报表
-     * @author qijian
-     * @date 2022/10/19
-     */
-    @PostMapping("/getLimitTargetData")
-    HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
deleted file mode 100644
index b6135bd1c..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/limitrate",//对应controller请求类
-        fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface LimitrateFeignClient {
-
-    /**
-     * 越限
-     */
-    @PostMapping("/LimitRateHanlder")
-    HttpResult<Boolean> limitRateHanlder(@RequestBody LineParam limitRateHanlderParam );
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
deleted file mode 100644
index c5a4df27e..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.NormalFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 监测点谐波异常
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,
-        path = "/normalLimit",
-        fallbackFactory = NormalFeignClientFallbackFactory.class
-)
-public interface NormalLimitFeignClient {
-
-    /**
-     * 批量处理报表
-     * @author qijian
-     * @date 2022/10/19
-     */
-    @PostMapping("/getNormLimitData")
-    HttpResult<String> getNormLimitData(@RequestBody @Validated LineParam lineParam) ;
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
deleted file mode 100644
index 586c7d11e..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.OnlineRateFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/onlineRate",//对应controller请求类
-        fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface OnlineRateFeignClient {
-
-    /**
-     * 在线率
-     */
-    @PostMapping("/getOnlineRateData")
-    HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
deleted file mode 100644
index 3cccf3d4d..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.njcn.prepare.harmonic.api.line;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.prepare.harmonic.api.line.fallback.PollutionFeignClientFallbackFactory;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 自定义报表
- * @author qijian
- * @date 2022/10/20
- */
-@FeignClient(
-        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
-        path = "/pollution",//对应controller请求类
-        fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类
-)
-public interface PollutionFeignClient {
-
-    /**
-     * 污区
-     */
-    @PostMapping("/processPollutionData")
-    HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam);
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
deleted file mode 100644
index a88d40d8a..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
-import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * ReportFeignClientFallbackFactory
- *
- * @author qijian
- * @version 1.0.0
- * @createTime 2022/10/24 - 9:52
- */
-@Slf4j
-@Component
-public class CoustomReportFeignClientFallbackFactory implements FallbackFactory<CoustmReportFeignClient> {
-
-    @Override
-    public CoustmReportFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new CoustmReportFeignClient() {
-            @Override
-            public HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam){
-                log.error("{}异常，降级处理，异常为：{}", "生成自定义报表:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
deleted file mode 100644
index 0e772755f..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * ReportFeignClientFallbackFactory
- *
- * @author qijian
- * @version 1.0.0
- * @createTime 2022/10/24 - 9:52
- */
-@Slf4j
-@Component
-public class DayDataFeignClientFallbackFactory implements FallbackFactory<DayDataFeignClient> {
-
-    @Override
-    public DayDataFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new DayDataFeignClient() {
-            @Override
-            public HttpResult<Boolean> dayDataHanlder(@RequestBody LineParam jobParam){
-                log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java
deleted file mode 100644
index f9e83540f..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/7 14:37
- */
-@Slf4j
-@Component
-public class DistortionRateFeignClientFallbackFactory implements FallbackFactory<DistortionRateFeignClient> {
-    @Override
-    public DistortionRateFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new DistortionRateFeignClient() {
-            @Override
-            public HttpResult<String> distortionRate(@RequestBody @Validated LineParam lineParam){
-                log.error("{}异常，降级处理，异常为：{}", "谐波畸变率:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java
deleted file mode 100644
index 01c971378..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/7 15:17
- */
-@Slf4j
-@Component
-public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactory<HarmonicGeneralFeignClient> {
-    @Override
-    public HarmonicGeneralFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new HarmonicGeneralFeignClient() {
-            @Override
-            public HttpResult<String> generalData(@RequestBody @Validated LineParam lineParam){
-                log.error("{}异常，降级处理，异常为：{}", "稳态综合评估:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java
deleted file mode 100644
index 0acf887c1..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author xiaoyao
- * @version 1.0.0
- * @createTime 2022/11/7 15:14
- */
-@Slf4j
-@Component
-public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory<HarmonicMetricFeignClient> {
-    @Override
-    public HarmonicMetricFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new HarmonicMetricFeignClient() {
-            @Override
-            public HttpResult<String> metricData(@RequestBody @Validated LineParam lineParam){
-                log.error("{}异常，降级处理，异常为：{}", "稳态指标评估:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
deleted file mode 100644
index bdd909121..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * IntegrityFeignClientFallbackFactory
- */
-@Slf4j
-@Component
-public class IntegrityFeignClientFallbackFactory implements FallbackFactory<IntegrityFeignClient> {
-
-    @Override
-    public IntegrityFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new IntegrityFeignClient() {
-            @Override
-            public HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam) {
-                log.error("{}异常，降级处理，异常为：{}", "数据完整性处理:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
deleted file mode 100644
index 2c6844bd3..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * ReportFeignClientFallbackFactory
- *
- * @author qijian
- * @version 1.0.0
- * @createTime 2022/10/24 - 9:52
- */
-@Slf4j
-@Component
-public class LimitTargetFeignClientFallbackFactory implements FallbackFactory<LimitTargetFeignClient> {
-
-    @Override
-    public LimitTargetFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new LimitTargetFeignClient() {
-            @Override
-            public HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam) {
-                log.error("{}异常，降级处理，异常为：{}", "越限数据:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
deleted file mode 100644
index 93780ce7f..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * ReportFeignClientFallbackFactory
- *
- * @author qijian
- * @version 1.0.0
- * @createTime 2022/10/24 - 9:52
- */
-@Slf4j
-@Component
-public class LimitrateFeignClientFallbackFactory implements FallbackFactory<LimitrateFeignClient> {
-
-    @Override
-    public LimitrateFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new LimitrateFeignClient() {
-            @Override
-            public HttpResult<Boolean> limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ){
-                log.error("{}异常，降级处理，异常为：{}", "越限数据处理:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
deleted file mode 100644
index 5cef19e96..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * NormalFeignClientFallbackFactory
- */
-@Slf4j
-@Component
-public class NormalFeignClientFallbackFactory implements FallbackFactory<NormalLimitFeignClient> {
-
-    @Override
-    public NormalLimitFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new NormalLimitFeignClient() {
-            @Override
-            public HttpResult<String> getNormLimitData(LineParam lineParam) {
-                log.error("{}异常，降级处理，异常为：{}", "告警数据:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
deleted file mode 100644
index b3f509d66..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * OnlineRateFeignClientFallbackFactory
- */
-@Slf4j
-@Component
-public class OnlineRateFeignClientFallbackFactory implements FallbackFactory<OnlineRateFeignClient> {
-
-    @Override
-    public OnlineRateFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new OnlineRateFeignClient() {
-            @Override
-            public HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam){
-                log.error("{}异常，降级处理，异常为：{}", "在线率:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
deleted file mode 100644
index c7063a0f8..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.njcn.prepare.harmonic.api.line.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pq.utils.DeviceEnumUtil;
-import com.njcn.prepare.harmonic.api.line.PollutionFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * PollutionFeignClientFallbackFactory
- *
- */
-@Slf4j
-@Component
-public class PollutionFeignClientFallbackFactory implements FallbackFactory<PollutionFeignClient> {
-
-    @Override
-    public PollutionFeignClient create(Throwable throwable) {
-        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
-        if (throwable.getCause() instanceof BusinessException) {
-            BusinessException businessException = (BusinessException)throwable.getCause();
-            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
-        }
-
-        Enum<?> finalExceptionEnum = exceptionEnum;
-        return new PollutionFeignClient() {
-            @Override
-            public HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam){
-                log.error("{}异常，降级处理，异常为：{}", "污区数据:  ", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-        };
-    }
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java
deleted file mode 100644
index 943bc253a..000000000
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.njcn.prepare.harmonic.api.voltage;
-
-/**
- * @author qijian
- * @version 1.0.0
- * @date 2022年10月24日 20:13
- */
-public interface VoltageFeignClient {
-
-}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
index 2ac99f388..164fb9cf1 100644
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
@@ -288,12 +288,17 @@ public class ReportServiceImpl implements ReportService {
                     .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
                     .append(InfluxDBSqlConstant.TZ);
         } else {
-            sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE)
-                    .append(InfluxDBSqlConstant.FROM).append(data.getClassId())
-                    .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM)
-                    .append(InfluxDBSqlConstant.TZ);
+            //cp95函数特殊处理 PERCENTILE(field_key, N)
+            if (InfluxDBSqlConstant.CP95.equals(method)){
+                sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE);
+            }else{
+                sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE);
+            }
+            sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId())
+                .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.TZ);
         }
 
         //根据不同的库表赋值