代码调整

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";
 
     /**

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;

pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java

@@ -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);

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);
 }

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);
+            }
+
 
         };
     }

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

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);
+    }
+
 }

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);
 }

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);
 }

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;
+    }
+
     /**
      * 根据用户选择的时间区间返回月份日期
      */

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; //暂降和短时中断分部情况
 

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.*;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
 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("暂态指标监测点日报")
+    @ApiOperation("监测点暂态事件发生次数")
-    public HttpResult<List<EventMonitorReportVO>> getDailyReport(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+    public HttpResult<List<EventMonitorReportVO>> getMonitorEventCount(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
-        String methodDescribe = getMethodDescribe("getDailyReport");
+        String methodDescribe = getMethodDescribe("getMonitorEventCount");
-        List<EventMonitorReportVO> list = eventMonitorReportService.getDailyReport(eventMonitorReportParam);
+        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);
+        List<EventDipShortDistributionTableVO> list = eventMonitorReportService.getEventDipShortDistributionByCond(eventMonitorReportParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventDipShortDistributionVO, methodDescribe);
+        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);
+        List<EventRiseDistributionTableVO> list = eventMonitorReportService.getEventRiseDistributionByCond(eventMonitorReportParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventRiseDistributionVO, methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
+
+
 }

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);
+
 }

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>

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);
 }

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml

@@ -387,12 +387,24 @@
             #{type}
         </foreach>
 
+        <choose>
+            <when test="dateType != null and dateType == 3">
                 <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+                    AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
                 </if>
                 <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+                    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>
 
+        <choose>
+            <when test="dateType != null and dateType == 3">
                 <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+                    AND DATE_FORMAT(start_time, '%Y-%m') &gt;= #{startTime}
                 </if>
                 <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+                    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>

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') <= 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>

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.*;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
 
 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);
 }

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);
         //结果集映射到对象中

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.*;
-import com.njcn.event.pojo.vo.EventMonitorReportVO;
-import com.njcn.event.pojo.vo.EventRiseDistributionVO;
 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 monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
-        String id = eventMonitorReportParam.getId(); //单位id
+//        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();
+//        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
-        if (CollUtil.isEmpty(deptDTOList)) {
+//        if (CollUtil.isEmpty(deptDTOList)) {
-            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+//            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
-        }
+//        }
-        //单位id集合
+//        //单位id集合
-        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        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));
+//        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));
 
         //查询暂态事件明细
-        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":
+                if (DicDataEnum.VOLTAGE_DIP.getCode().equalsIgnoreCase(code)) {
-                        eventMonitorReportVO.setVoltageDipCount(CollUtil.isNotEmpty(value) ? value.size() : 0); //电压暂降次数
+                    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_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 monitorName = eventMonitorReportParam.getMonitorName(); //监测点名称
-        String id = eventMonitorReportParam.getId(); //单位id
+//        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)) {
+//        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
-            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+//        if (CollUtil.isEmpty(deptDTOList)) {
-        }
+//            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
-        //单位id集合
+//        }
-        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+//        //单位id集合
-        //查询监测点信息
+//        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
-        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
+//        //查询监测点信息
-        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
+//        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
-        pmsMonitorParam.setOrgIds(orgNoList); //单位ids
+//        pmsMonitorParam.setMonitorName(monitorName); //监测点名称
-        List<PmsMonitorDTO> monitorList = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData(); //监测点信息
+//        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集合
 
-        //获取暂态指标的字典
+        return monitorList;
-        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);
     }
 }

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;
 
 }

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;
 

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;
+    }
+
 
 }

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);
     }
 

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

@@ -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);
-    }
-
-}
-

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);
+    }
 }

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

@@ -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);
-    }
-
-
-}
-

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

@@ -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);
-    }
-
-}
-

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

@@ -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);
-    }
-
-}
-

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

@@ -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);
-    }
-}
-

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

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

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

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

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

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

@@ -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);
-}

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

@@ -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> {
-
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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",

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

@@ -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> {
-
-}

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

@@ -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);
-}

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

@@ -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> {
-
-}

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

@@ -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> {
-
-
-}

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

@@ -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> {
-
-}

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

@@ -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> {
-
-}

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

@@ -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> {
-
-}

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

@@ -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> {
-
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-
-}

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

@@ -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);
-}

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

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报表导出数据完整性

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);
 }

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);
 }

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);
 }

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
 */

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
 */

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
 */

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
 */

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
 */

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

@@ -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);
-}

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

@@ -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);
-}

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

@@ -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);
-}