监测点报告抽取公共方法

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

@@ -0,0 +1,159 @@
+package com.njcn.harmonic.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.*;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.IRStatLimitRateDService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "合格率统计日表(越限次数)")
+public class RStatLimitRateDController extends BaseController {
+
+    private final IRStatLimitRateDService limitRateDService;
+
+    /**
+     * 来源于RStatLimitController的monitorIdsGetLimitRateInfo
+     */
+    @PostMapping("/limitRateD/monitorIdsGetLimitRateInfo")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指定日期超标监测点详细信息")
+    public HttpResult<List<RStatLimitRateDPO>> monitorIdsGetLimitRateInfo(@RequestBody RStatLimitQueryParam rStatLimitQueryParam) {
+        String methodDescribe = getMethodDescribe("monitorIdsGetLimitRateInfo");
+        List<RStatLimitRateDPO> result = limitRateDService.monitorIdsGetLimitRateInfo(rStatLimitQueryParam.getDate(), rStatLimitQueryParam.getIds());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    /**
+     * 来源于RStatLimitController的getOverData
+     */
+    @PostMapping("/limitRateD/getOverData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询单监测点超标数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lineId", value = "监测点id"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间"),
+            @ApiImplicitParam(name = "type", value = "指标"),
+    })
+    public HttpResult<List<RStatLimitRateDPO>> getOverData(@RequestParam("lineId") String lineId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("type") Integer type) {
+        String methodDescribe = getMethodDescribe("getOverData");
+        List<RStatLimitRateDPO> result = limitRateDService.getOverData(lineId, startTime, endTime, type);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    /**
+     * 来源于 HistoryResultController的getLinesRate
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/harmonic/getLinesRate")
+    @ApiOperation("获取越线监测点越线次数")
+    @ApiImplicitParam(name = "param", value = "获取越线监测点越线次数请求参数", required = true)
+    public HttpResult<List<RStatLimitRateDPO>> getLinesRate(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getLinesTarget");
+        List<RStatLimitRateDPO> list = limitRateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .in(RStatLimitRateDPO::getLineId, param.getIds())
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatLimitRateDPO::getTime, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatLimitRateDPO::getTime, param.getEndTime())
+
+        );
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @PostMapping("/mainLine/list")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主要监测点列表")
+    public HttpResult<Page<MainLineVO>> mainLineList(@RequestBody MainLineQueryParam mainLineQueryParam) {
+        String methodDescribe = getMethodDescribe("mainLineList");
+        Page<MainLineVO> list = limitRateDService.mainLineList(mainLineQueryParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/mainLine/statLimitRateDetails")
+    @ApiOperation("监测点指标越限详情")
+    @ApiImplicitParam(name = "param", value = "获取监测点指标越限详情请求参数", required = true)
+    public HttpResult<List<MainLineStatLimitRateDetailsVO>> mainLineStatLimitRateDetails(@RequestBody MainLineStatLimitRateDetailsQueryParam param) {
+        String methodDescribe = getMethodDescribe("mainLineStatLimitRateDetails");
+        List<MainLineStatLimitRateDetailsVO> list = limitRateDService.mainLineStatLimitRateDetails(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/totalLimitStatistics/data")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("总体指标越限统计数据")
+    public HttpResult<TotalLimitTotalStatisticsVO> totalLimitTotalStatisticsData(@RequestBody TotalLimitStatisticsParam mainLineQueryParam) {
+        String methodDescribe = getMethodDescribe("totalLimitStatisticsList");
+        TotalLimitTotalStatisticsVO data = limitRateDService.totalLimitTotalStatisticsData(mainLineQueryParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
+
+    @PostMapping("/totalLimitStatistics/list")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("总体指标越限统计列表")
+    public HttpResult<List<TotalLimitStatisticsVO>> totalLimitStatisticsList(@RequestBody TotalLimitStatisticsParam mainLineQueryParam) {
+        String methodDescribe = getMethodDescribe("totalLimitStatisticsList");
+        List<TotalLimitStatisticsVO> list = limitRateDService.totalLimitStatisticsList(mainLineQueryParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/totalLimitStatistics/details")
+    @ApiOperation("每日越限占比统计")
+    @ApiImplicitParam(name = "param", value = "每日越限占比统计请求参数", required = true)
+    public HttpResult<List<TotalLimitStatisticsDetailsVO>> totalLimitStatisticsDetails(@RequestBody TotalLimitStatisticsDetailsQueryParam param) {
+        String methodDescribe = getMethodDescribe("totalLimitStatisticsDetails");
+        List<TotalLimitStatisticsDetailsVO> list = limitRateDService.totalLimitStatisticsDetails(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("/gridSideLimitStatistics/data")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("电网侧指标越限统计数据")
+    public HttpResult<TotalLimitTotalStatisticsVO> gridSideLimitTotalStatisticsData(@RequestBody TotalLimitStatisticsParam mainLineQueryParam) {
+        String methodDescribe = getMethodDescribe("gridSideLimitTotalStatisticsData");
+        TotalLimitTotalStatisticsVO data = limitRateDService.gridSideLimitTotalStatisticsData(mainLineQueryParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
+    }
+
+    @PostMapping("/gridSideLimitStatistics/list")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("电网侧指标越限统计列表")
+    public HttpResult<List<TotalLimitStatisticsVO>> gridSideLimitStatisticsList(@RequestBody TotalLimitStatisticsParam mainLineQueryParam) {
+        String methodDescribe = getMethodDescribe("gridSideLimitStatisticsList");
+        List<TotalLimitStatisticsVO> list = limitRateDService.gridSideLimitStatisticsList(mainLineQueryParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.njcn.harmonic.controller;
+
+
+import cn.hutool.json.JSONArray;
+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.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.LimitCalendarQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentDayQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentQueryParam;
+import com.njcn.harmonic.pojo.param.LimitProbabilityQueryParam;
+import com.njcn.harmonic.pojo.vo.LimitCalendarVO;
+import com.njcn.harmonic.pojo.vo.LimitExtentVO;
+import com.njcn.harmonic.pojo.vo.LimitProbabilityVO;
+import com.njcn.harmonic.pojo.vo.LimitTimeProbabilityVO;
+import com.njcn.harmonic.service.IRStatLimitRateDetailDService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "合格率统计日表详细(越限详情)")
+public class RStatLimitRateDetailDController extends BaseController {
+
+    private final IRStatLimitRateDetailDService limitRateDetailDService;
+
+    @PostMapping("/limitRateDetailD/limitExtentData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指标越限程度数据")
+    public HttpResult<List<LimitExtentVO>> limitExtentData(@RequestBody LimitExtentQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("limitExtentData");
+        List<LimitExtentVO> result = limitRateDetailDService.limitExtentData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PostMapping("/limitRateDetailD/limitExtentDayData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指标日趋势图数据")
+    public HttpResult<JSONArray> limitExtentDayData(@RequestBody LimitExtentDayQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("limitExtentDayData");
+        JSONArray result = limitRateDetailDService.limitExtentDayData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PostMapping("/limitRateDetailD/limitCalendarData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指标越限明细日历数据")
+    public HttpResult<List<LimitCalendarVO>> limitCalendarData(@RequestBody LimitCalendarQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("limitCalendarData");
+        List<LimitCalendarVO> result = limitRateDetailDService.limitCalendarData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    @PostMapping("/limitRateDetailD/limitProbabilityData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指标越限程度概率分布数据")
+    public HttpResult<List<LimitProbabilityVO>> limitProbabilityData(@RequestBody LimitProbabilityQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("limitProbabilityData");
+        List<LimitProbabilityVO> result = limitRateDetailDService.limitProbabilityData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @PostMapping("/limitRateDetailD/limitTimeProbabilityData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取指标越限时间概率分布数据")
+    public HttpResult<List<LimitTimeProbabilityVO>> limitTimeProbabilityData(@RequestBody LimitProbabilityQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("limitTimeProbabilityData");
+        List<LimitTimeProbabilityVO> result = limitRateDetailDService.limitTimeProbabilityData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+}

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

@@ -10,7 +10,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.harmonic.pojo.param.ReportSearchParam;
 import com.njcn.harmonic.pojo.param.ReportTemplateParam;
 import com.njcn.harmonic.pojo.po.ExcelRptTemp;
-import com.njcn.harmonic.pojo.vo.ReportTemplateVO;
+import com.njcn.harmonic.common.pojo.vo.ReportTemplateVO;
 import com.njcn.harmonic.pojo.vo.ReportTreeVO;
 import com.njcn.harmonic.pojo.vo.SysDeptTempVO;
 import com.njcn.harmonic.service.report.CustomReportService;

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

@@ -1,39 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.harmonic.pojo.param.ReportSearchParam;
-import com.njcn.harmonic.pojo.po.ExcelRptTemp;
-import com.njcn.harmonic.pojo.vo.ReportTemplateVO;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-import com.njcn.user.pojo.dto.DeptDTO;
-import com.njcn.web.pojo.param.BaseParam;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/8/16
- */
-public interface ExcelRptTempMapper extends BaseMapper<ExcelRptTemp> {
-
-    Page<ReportTemplateVO> getReportTemplateListPage(Page<BaseParam> page, @Param("baseParam")BaseParam baseParam);
-
-    List<ReportTemplateVO> getReportTemplateList(@Param("reportSearchParam")ReportSearchParam reportSearchParam);
-
-    List<ReportTemplateVO> getReportTemplateByDept(@Param("ids") List<String> ids);
-
-
-    @Select("${sqlStr}")
-    StatisticalDataDTO dynamicSql(@Param("sqlStr")String sql);
-
-    @Select("${sqlStr}")
-    Map<String, Float> dynamicSqlMap(@Param("sqlStr")String sql);
-}

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

@@ -1,13 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
-
-/**
- * @Description:
- * @Author: wr
- * @Date: 2024/7/31 9:24
- */
-public interface RStatDataHarmRateVDMapper extends BaseMapper<RStatDataHarmrateVDPO> {
-
-}

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

@@ -1,31 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatDataVD;
-import com.njcn.harmonic.pojo.po.day.RStatDataIDPO;
-import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wr
- * @since 2023-04-17
- */
-public interface RStatDataIDMapper extends BaseMapper<RStatDataIDPO> {
-
-    /**
-     * 获取监测点负序电流
-     * @return
-     */
-    List<RStatDataIDPO> getINeg(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    /**
-     * 谐波电流
-     */
-    List<RStatDataIDPO> getI(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-}

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

@@ -1,17 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author: wr
- * @Date: 2024/7/31 9:24
- */
-public interface RStatDataInharmVDMapper extends BaseMapper<RStatDataInharmVDPO> {
-
-    List<RStatDataInharmVDPO> getV(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-}

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

@@ -1,44 +0,0 @@
-package com.njcn.harmonic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RStatDataVD;
-import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wr
- * @since 2023-03-31
- */
-public interface RStatDataVDMapper extends BaseMapper<RStatDataVD> {
-
-    /**
-     * 获取频率偏差、三相电压不平衡度
-     */
-    List<RStatDataVD> getFreqDev(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    /**
-     * 获取电压偏差
-     */
-    List<RStatDataVD> getVuDev(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    /**
-     * 获取电压总谐波畸变率
-     */
-    List<RStatDataVD> getVthd(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    /**
-     * 获取三相电压不平衡度
-     */
-    List<RStatDataVD> getUnbalance(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    /**
-     * 获取谐波电压
-     */
-    List<RStatDataVD> getV(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
-}

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

@@ -0,0 +1,76 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.MonitorOverLimitVO;
+import com.njcn.harmonic.pojo.vo.RStatLimitRateDVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 合格率统计日表(越限次数) Mapper 接口
+ * </p>
+ *
+ * @author wr
+ * @since 2023-04-03
+ */
+public interface RStatLimitRateDMapper extends BaseMapper<RStatLimitRateDPO> {
+
+    List<RStatLimitRateDVO> getSumPassRate(
+            @Param("ids") List<String> lineIndexes,
+            @Param("statTime") String searchBeginTime,
+            @Param("endTime") String searchEndTime);
+
+
+    List<MonitorOverLimitVO> getSumLimitRateByLineIndexes(
+            @Param("ids") List<String> lineIndexes,
+            @Param("statTime") String searchBeginTime,
+            @Param("endTime") String searchEndTime);
+
+    Page<MonitorOverLimitVO> getSumLimitRatePage(Page<RStatLimitRateDPO> p,
+                                                 @Param("ids") List<String> lineIndexes,
+                                                 @Param("statTime") String searchBeginTime,
+                                                 @Param("endTime") String searchEndTime);
+
+    List<MonitorOverLimitVO.DataVO> getPercentages(
+                                                    @Param("ids") List<String> lineIndexes,
+                                                    @Param("statTime") String searchBeginTime,
+                                                    @Param("endTime") String searchEndTime);
+
+
+    /**
+     * 数据查询
+     * @param list
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<RStatLimitRateDPO> getSumPassRateList( @Param("ids") List<String> list,
+                                                @Param("statTime") String startTime,
+                                                @Param("endTime") String endTime);
+
+    /**
+     * 获取综合评估下的指标完整率
+     * @param list
+     * @param startTime
+     * @param endTime
+     * @return111
+     */
+    List<RStatLimitRateDPO> getAssessTargetRate( @Param("ids") List<String> list,
+                                                @Param("statTime") String startTime,
+                                                @Param("endTime") String endTime);
+
+    /**
+     * 获取监测点的超标次数
+     * @param list
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<RStatLimitRateDPO> getAllOverTimes( @Param("ids") List<String> list,
+                                                 @Param("statTime") String startTime,
+                                                 @Param("endTime") String endTime);
+}

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

@@ -0,0 +1,9 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDetailDPO;
+
+
+public interface RStatLimitRateDetailDMapper extends BaseMapper<RStatLimitRateDetailDPO> {
+
+}

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

@@ -1,62 +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.ExcelRptTempMapper">
-
-    <select id="getReportTemplateListPage" resultType="ReportTemplateVO">
-        select
-        a.id,
-        a.name,
-        a.dept_id,
-        b.name deptName,
-        a.activation,
-        a.update_time,
-        c.name updateBy
-        from sys_excel_rpt_temp a
-        left join sys_dept b on a.dept_id = b.id
-        left join sys_user c on a.update_by = c.id
-        where a.state = 1
-        <if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
-            and (
-            a.name like CONCAT('%', #{baseParam.searchValue},'%') or
-            b.name like CONCAT('%', #{baseParam.searchValue},'%')
-            )
-        </if>
-    </select>
-
-    <select id="getReportTemplateList" resultType="ReportTemplateVO">
-        SELECT
-            a.id,
-            a.NAME,
-            a.update_time,
-            a.create_time,
-            d.NAME updateBy,
-            a.Activation,
-            a.Report_Type,
-            a.Report_Form
-        FROM
-            sys_excel_rpt_temp a
-            LEFT JOIN sys_user d ON a.update_by = d.id
-        WHERE
-            a.state = 1
-    </select>
-
-    <select id="getReportTemplateByDept" resultType="ReportTemplateVO">
-        SELECT
-        DISTINCT
-        a.id,
-        a.NAME,
-        a.activation,
-        a.report_form,
-        a.sort
-        FROM
-        sys_excel_rpt_temp a
-        LEFT JOIN sys_dept_temp b ON a.Id = b.temp_id
-        WHERE
-        a.activation = 1
-        and b.dept_id in
-        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        order by a.sort asc
-    </select>
-</mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.mapper.RStatDataIDMapper">
+<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataIDMapper">
 
     <select id="getINeg" resultType="com.njcn.harmonic.pojo.po.day.RStatDataIDPO">
         select

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.mapper.RStatDataInharmVDMapper">
+<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataInharmVDMapper">
 
 
     <select id="getV" resultType="com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO">

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.mapper.RStatDataVDMapper">
+<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataVDMapper">
 
     <select id="getFreqDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select

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

@@ -0,0 +1,475 @@
+<?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.rstatlimitrate.mapper.RStatLimitRateDMapper">
+
+    <select id="getSumPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatLimitRateDVO">
+        SELECT
+            SUM( all_time ) AS alltime,
+            SUM( freq_dev_overtime ) AS frequency,
+            SUM( ubalance_overtime ) AS uBalance,
+            SUM( i_neg_overtime ) AS iNeg,
+            SUM( iharm_13_overtime ) AS harmElec,
+            SUM( uharm_4_overtime ) AS harmVoltage,
+            SUM( flicker_overtime ) AS flicker,
+            SUM( flicker_all_time ) AS allFlicker,
+            SUM( voltage_dev_overtime ) AS voltageDeviation,
+            SUM( inuharm_9_overtime ) AS inUharm
+        FROM
+            r_stat_limit_rate_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" statTime != null and statTime !=''">
+                AND  time_id >= #{statTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getSumLimitRateByLineIndexes" resultType="com.njcn.harmonic.pojo.vo.MonitorOverLimitVO">
+        SELECT
+        my_index AS id,
+        SUM(all_time) AS overDay,
+        SUM(freq_dev_overtime) AS freqOverDay,
+        SUM(voltage_dev_overtime ) AS volDevOverDay,
+        SUM(flicker_overtime) AS flickerOverDay,
+        SUM(i_neg_overtime) AS negativeOverDay,
+        SUM(ubalance_overtime) AS threeUnbalance,
+        SUM(uaberrance_overtime) AS volDisOverDay,
+        SUM(uharm_3_overtime) AS overVolThreeTimes,
+        SUM(uharm_5_overtime) AS overVolFiveTimes,
+        SUM(uharm_7_overtime) AS overVolSevenTimes,
+        SUM(uharm_11_overtime) AS overVolElevenTimes,
+        SUM(uharm_13_overtime) AS overVolThirteenTimes,
+        SUM(uharm_23_overtime) AS overVolTwentyThreeTimes,
+        SUM(uharm_25_overtime) AS overVolTwentyFiveTimes,
+        SUM(uharm_2_overtime)
+        + SUM(uharm_4_overtime)
+        + SUM(uharm_6_overtime)
+        + SUM(uharm_8_overtime)
+        + SUM(uharm_9_overtime)
+        + SUM(uharm_10_overtime)
+        + SUM(uharm_12_overtime)
+        + SUM(uharm_14_overtime)
+        + SUM(uharm_15_overtime)
+        + SUM(uharm_16_overtime)
+        + SUM(uharm_17_overtime)
+        + SUM(uharm_18_overtime)
+        + SUM(uharm_19_overtime)
+        + SUM(uharm_20_overtime)
+        + SUM(uharm_21_overtime)
+        + SUM(uharm_22_overtime)
+        + SUM(uharm_24_overtime) AS overVolOtherTimes,
+        SUM(iharm_3_overtime) AS overCurThreeTimes,
+        SUM(iharm_5_overtime) AS overCurFiveTimes,
+        SUM(iharm_7_overtime) AS overCurSevenTimes,
+        SUM(iharm_11_overtime) AS overCurElevenTimes,
+        SUM(iharm_13_overtime) AS overCurThirteenTimes,
+        SUM(iharm_23_overtime) AS overCurTwentyThreeTimes,
+        SUM(iharm_25_overtime) AS overCurTwentyFiveTimes,
+        SUM(iharm_2_overtime)
+        + SUM(iharm_4_overtime)
+        + SUM(iharm_6_overtime)
+        + SUM(iharm_8_overtime)
+        + SUM(iharm_9_overtime)
+        + SUM(iharm_10_overtime)
+        + SUM(iharm_12_overtime)
+        + SUM(iharm_14_overtime)
+        + SUM(iharm_15_overtime)
+        + SUM(iharm_16_overtime)
+        + SUM(iharm_17_overtime)
+        + SUM(iharm_18_overtime)
+        + SUM(iharm_19_overtime)
+        + SUM(iharm_20_overtime)
+        + SUM(iharm_21_overtime)
+        + SUM(iharm_22_overtime)
+        + SUM(iharm_24_overtime) AS overCurOtherTimes
+        FROM
+        r_stat_limit_rate_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" statTime != null and statTime !=''">
+                AND  time_id >= #{statTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY my_index
+    </select>
+    <select id="getSumLimitRatePage" resultType="com.njcn.harmonic.pojo.vo.MonitorOverLimitVO">
+        SELECT
+        my_index AS id,
+        SUM(all_time) AS overDay,
+        SUM(freq_dev_overtime) AS freqOverDay,
+        SUM(voltage_dev_overtime ) AS volDevOverDay,
+        SUM(flicker_overtime) AS flickerOverDay,
+        SUM(i_neg_overtime) AS negativeOverDay,
+        SUM(ubalance_overtime) AS threeUnbalance,
+        SUM(uaberrance_overtime) AS volDisOverDay,
+        SUM(uharm_3_overtime) AS overVolThreeTimes,
+        SUM(uharm_5_overtime) AS overVolFiveTimes,
+        SUM(uharm_7_overtime) AS overVolSevenTimes,
+        SUM(uharm_11_overtime) AS overVolElevenTimes,
+        SUM(uharm_13_overtime) AS overVolThirteenTimes,
+        SUM(uharm_23_overtime) AS overVolTwentyThreeTimes,
+        SUM(uharm_25_overtime) AS overVolTwentyFiveTimes,
+        SUM(uharm_2_overtime)
+        + SUM(uharm_4_overtime)
+        + SUM(uharm_6_overtime)
+        + SUM(uharm_8_overtime)
+        + SUM(uharm_9_overtime)
+        + SUM(uharm_10_overtime)
+        + SUM(uharm_12_overtime)
+        + SUM(uharm_14_overtime)
+        + SUM(uharm_15_overtime)
+        + SUM(uharm_16_overtime)
+        + SUM(uharm_17_overtime)
+        + SUM(uharm_18_overtime)
+        + SUM(uharm_19_overtime)
+        + SUM(uharm_20_overtime)
+        + SUM(uharm_21_overtime)
+        + SUM(uharm_22_overtime)
+        + SUM(uharm_24_overtime) AS overVolOtherTimes,
+        SUM(iharm_3_overtime) AS overCurThreeTimes,
+        SUM(iharm_5_overtime) AS overCurFiveTimes,
+        SUM(iharm_7_overtime) AS overCurSevenTimes,
+        SUM(iharm_11_overtime) AS overCurElevenTimes,
+        SUM(iharm_13_overtime) AS overCurThirteenTimes,
+        SUM(iharm_23_overtime) AS overCurTwentyThreeTimes,
+        SUM(iharm_25_overtime) AS overCurTwentyFiveTimes,
+        SUM(iharm_2_overtime)
+        + SUM(iharm_4_overtime)
+        + SUM(iharm_6_overtime)
+        + SUM(iharm_8_overtime)
+        + SUM(iharm_9_overtime)
+        + SUM(iharm_10_overtime)
+        + SUM(iharm_12_overtime)
+        + SUM(iharm_14_overtime)
+        + SUM(iharm_15_overtime)
+        + SUM(iharm_16_overtime)
+        + SUM(iharm_17_overtime)
+        + SUM(iharm_18_overtime)
+        + SUM(iharm_19_overtime)
+        + SUM(iharm_20_overtime)
+        + SUM(iharm_21_overtime)
+        + SUM(iharm_22_overtime)
+        + SUM(iharm_24_overtime) AS overCurOtherTimes
+        FROM
+        r_stat_limit_target_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" statTime != null and statTime !=''">
+                AND  time_id >= #{statTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY my_index
+    </select>
+
+    <select id="getPercentages" resultType="com.njcn.harmonic.pojo.vo.MonitorOverLimitVO$DataVO">
+            SELECT
+            <choose>
+                <when test="_databaseId == 'mysql'">
+                    DATE_FORMAT(time_id, '%Y-%m-%d')
+                </when>
+                <otherwise>
+                    TO_CHAR(time_id, 'YYYY-MM-DD')
+                </otherwise>
+            </choose> AS time,
+            <choose>
+                <when test="_databaseId == 'mysql'">
+                    IFNULL(ROUND(
+                </when>
+                <otherwise>
+                    NVL(TRUNC(
+                </otherwise>
+            </choose>
+            CASE
+            WHEN SUM(all_time) = 0 THEN 0
+            ELSE (1 - (
+            -- 各类指标求和（保持原有逻辑不变）
+            SUM(flicker_overtime) + SUM(flicker_all_time) + SUM(freq_dev_overtime) +
+            SUM(voltage_dev_overtime) + SUM(ubalance_overtime) + SUM(uaberrance_overtime) +
+            SUM(i_neg_overtime) +
+            -- 电压谐波 (2-25)
+            SUM(uharm_2_overtime) + SUM(uharm_3_overtime) + SUM(uharm_4_overtime) + SUM(uharm_5_overtime) +
+            SUM(uharm_6_overtime) + SUM(uharm_7_overtime) + SUM(uharm_8_overtime) + SUM(uharm_9_overtime) +
+            SUM(uharm_10_overtime) + SUM(uharm_11_overtime) + SUM(uharm_12_overtime) + SUM(uharm_13_overtime) +
+            SUM(uharm_14_overtime) + SUM(uharm_15_overtime) + SUM(uharm_16_overtime) + SUM(uharm_17_overtime) +
+            SUM(uharm_18_overtime) + SUM(uharm_19_overtime) + SUM(uharm_20_overtime) + SUM(uharm_21_overtime) +
+            SUM(uharm_22_overtime) + SUM(uharm_23_overtime) + SUM(uharm_24_overtime) + SUM(uharm_25_overtime) +
+            -- 电流谐波 (2-25)
+            SUM(iharm_2_overtime) + SUM(iharm_3_overtime) + SUM(iharm_4_overtime) + SUM(iharm_5_overtime) +
+            SUM(iharm_6_overtime) + SUM(iharm_7_overtime) + SUM(iharm_8_overtime) + SUM(iharm_9_overtime) +
+            SUM(iharm_10_overtime) + SUM(iharm_11_overtime) + SUM(iharm_12_overtime) + SUM(iharm_13_overtime) +
+            SUM(iharm_14_overtime) + SUM(iharm_15_overtime) + SUM(iharm_16_overtime) + SUM(iharm_17_overtime) +
+            SUM(iharm_18_overtime) + SUM(iharm_19_overtime) + SUM(iharm_20_overtime) + SUM(iharm_21_overtime) +
+            SUM(iharm_22_overtime) + SUM(iharm_23_overtime) + SUM(iharm_24_overtime) + SUM(iharm_25_overtime) +
+            -- 间谐波 (1-16)
+            SUM(inuharm_1_overtime) + SUM(inuharm_2_overtime) + SUM(inuharm_3_overtime) + SUM(inuharm_4_overtime) +
+            SUM(inuharm_5_overtime) + SUM(inuharm_6_overtime) + SUM(inuharm_7_overtime) + SUM(inuharm_8_overtime) +
+            SUM(inuharm_9_overtime) + SUM(inuharm_10_overtime) + SUM(inuharm_11_overtime) + SUM(inuharm_12_overtime) +
+            SUM(inuharm_13_overtime) + SUM(inuharm_14_overtime) + SUM(inuharm_15_overtime) + SUM(inuharm_16_overtime)
+            ) / NULLIF(SUM(all_time) * 71, 0)) * 100
+            END, 2), 0) AS data
+            FROM
+            r_stat_limit_rate_d
+            <where>
+                phasic_type = 'T'
+                <if test="ids != null and ids.size > 0">
+                    AND my_index IN
+                    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="statTime != null and statTime != ''">
+                    AND time_id >= #{statTime}
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    AND time_id &lt;= #{endTime}
+                </if>
+            </where>
+            GROUP BY
+            <choose>
+                <when test="_databaseId == 'mysql'">
+                    DATE_FORMAT(time_id, '%Y-%m-%d')
+                </when>
+                <otherwise>
+                    TO_CHAR(time_id, 'YYYY-MM-DD')
+                </otherwise>
+            </choose>
+            ORDER BY time
+    </select>
+
+
+    <select id="getSumPassRateList" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO">
+        SELECT
+        my_index as lineId ,
+        sum(all_time) as all_time,
+        sum(flicker_all_time) as flicker_all_time,
+        sum(freq_dev_overtime) as freq_dev_overtime,
+        sum(voltage_dev_overtime) as voltage_dev_overtime,
+        sum(ubalance_overtime) as ubalance_overtime,
+        sum(flicker_overtime) as flicker_overtime,
+        sum(uaberrance_overtime) as uaberrance_overtime,
+        sum(uharm_2_overtime) as uharm_2_overtime,
+        sum(uharm_3_overtime) as uharm_3_overtime,
+        sum(uharm_4_overtime) as uharm_4_overtime,
+        sum(uharm_5_overtime) as uharm_5_overtime,
+        sum(uharm_6_overtime) as uharm_6_overtime,
+        sum(uharm_7_overtime) as uharm_7_overtime,
+        sum(uharm_8_overtime) as uharm_8_overtime,
+        sum(uharm_9_overtime) as uharm_9_overtime,
+        sum(uharm_10_overtime) as uharm_10_overtime,
+        sum(uharm_11_overtime) as uharm_11_overtime,
+        sum(uharm_12_overtime) as uharm_12_overtime,
+        sum(uharm_13_overtime) as uharm_13_overtime,
+        sum(uharm_14_overtime) as uharm_14_overtime,
+        sum(uharm_15_overtime) as uharm_15_overtime,
+        sum(uharm_16_overtime) as uharm_16_overtime,
+        sum(uharm_17_overtime) as uharm_17_overtime,
+        sum(uharm_18_overtime) as uharm_18_overtime,
+        sum(uharm_19_overtime) as uharm_19_overtime,
+        sum(uharm_20_overtime) as uharm_20_overtime,
+        sum(uharm_21_overtime) as uharm_21_overtime,
+        sum(uharm_22_overtime) as uharm_22_overtime,
+        sum(uharm_23_overtime) as uharm_23_overtime,
+        sum(uharm_24_overtime) as uharm_24_overtime,
+        sum(uharm_25_overtime) as uharm_25_overtime,
+        sum(iharm_2_overtime) as iharm_2_overtime,
+        sum(iharm_3_overtime) as iharm_3_overtime,
+        sum(iharm_4_overtime) as iharm_4_overtime,
+        sum(iharm_5_overtime) as iharm_5_overtime,
+        sum(iharm_6_overtime) as iharm_6_overtime,
+        sum(iharm_7_overtime) as iharm_7_overtime,
+        sum(iharm_8_overtime) as iharm_8_overtime,
+        sum(iharm_9_overtime) as iharm_9_overtime,
+        sum(iharm_10_overtime) as iharm_10_overtime,
+        sum(iharm_11_overtime) as iharm_11_overtime,
+        sum(iharm_12_overtime) as iharm_12_overtime,
+        sum(iharm_13_overtime) as iharm_13_overtime,
+        sum(iharm_14_overtime) as iharm_14_overtime,
+        sum(iharm_15_overtime) as iharm_15_overtime,
+        sum(iharm_16_overtime) as iharm_16_overtime,
+        sum(iharm_17_overtime) as iharm_17_overtime,
+        sum(iharm_18_overtime) as iharm_18_overtime,
+        sum(iharm_19_overtime) as iharm_19_overtime,
+        sum(iharm_20_overtime) as iharm_20_overtime,
+        sum(iharm_21_overtime) as iharm_21_overtime,
+        sum(iharm_22_overtime) as iharm_22_overtime,
+        sum(iharm_23_overtime) as iharm_23_overtime,
+        sum(iharm_24_overtime) as iharm_24_overtime,
+        sum(iharm_25_overtime) as iharm_25_overtime,
+        sum(inuharm_1_overtime) as inuharm_1_overtime,
+        sum(inuharm_2_overtime) as inuharm_2_overtime,
+        sum(inuharm_3_overtime) as inuharm_3_overtime,
+        sum(inuharm_4_overtime) as inuharm_4_overtime,
+        sum(inuharm_5_overtime) as inuharm_5_overtime,
+        sum(inuharm_6_overtime) as inuharm_6_overtime,
+        sum(inuharm_7_overtime) as inuharm_7_overtime,
+        sum(inuharm_8_overtime) as inuharm_8_overtime,
+        sum(inuharm_9_overtime) as inuharm_9_overtime,
+        sum(inuharm_10_overtime) as inuharm_10_overtime,
+        sum(inuharm_11_overtime) as inuharm_11_overtime,
+        sum(inuharm_12_overtime) as inuharm_12_overtime,
+        sum(inuharm_13_overtime) as inuharm_13_overtime,
+        sum(inuharm_14_overtime) as inuharm_14_overtime,
+        sum(inuharm_15_overtime) as inuharm_15_overtime,
+        sum(inuharm_16_overtime) as inuharm_16_overtime,
+        sum(i_neg_overtime) as i_neg_overtime
+        from
+            r_stat_limit_rate_d
+        <where>
+            phasic_type = 'T'
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" statTime != null and statTime !=''">
+                AND  time_id >= #{statTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY
+            my_index
+    </select>
+
+    <select id="getAssessTargetRate" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO">
+        select
+            my_index as lineId,
+            SUM(all_time) as allTime,
+            SUM(flicker_all_time) as flickerAllTime,
+            SUM(freq_dev_overtime) as freqDevOvertime,
+            SUM(voltage_dev_overtime) as voltageDevOvertime,
+            SUM(flicker_overtime) as flickerOvertime,
+            SUM(ubalance_overtime) as ubalanceOvertime,
+            SUM(uaberrance_overtime) as uaberranceOvertime,
+            sum(uharm_2_overtime)  uharm2Overtime,
+            sum(uharm_3_overtime)  uharm3Overtime,
+            sum(uharm_4_overtime)  uharm4Overtime,
+            sum(uharm_5_overtime)  uharm5Overtime,
+            sum(uharm_6_overtime)  uharm6Overtime,
+            sum(uharm_7_overtime)  uharm7Overtime,
+            sum(uharm_8_overtime)  uharm8Overtime,
+            sum(uharm_9_overtime)  uharm9Overtime,
+            sum(uharm_10_overtime)  uharm10Overtime,
+            sum(uharm_11_overtime)  uharm11Overtime,
+            sum(uharm_12_overtime)  uharm12Overtime,
+            sum(uharm_13_overtime)  uharm13Overtime,
+            sum(uharm_14_overtime)  uharm14Overtime,
+            sum(uharm_15_overtime)  uharm15Overtime,
+            sum(uharm_16_overtime)  uharm16Overtime,
+            sum(uharm_17_overtime)  uharm17Overtime,
+            sum(uharm_18_overtime)  uharm18Overtime,
+            sum(uharm_19_overtime)  uharm19Overtime,
+            sum(uharm_20_overtime)  uharm20Overtime,
+            sum(uharm_21_overtime)  uharm21Overtime,
+            sum(uharm_22_overtime)  uharm22Overtime,
+            sum(uharm_23_overtime)  uharm23Overtime,
+            sum(uharm_24_overtime)  uharm24Overtime,
+            sum(uharm_25_overtime)  uharm25Overtime,
+            sum(iharm_2_overtime)  iharm2Overtime,
+            sum(iharm_3_overtime)  iharm3Overtime,
+            sum(iharm_4_overtime)  iharm4Overtime,
+            sum(iharm_5_overtime)  iharm5Overtime,
+            sum(iharm_6_overtime)  iharm6Overtime,
+            sum(iharm_7_overtime)  iharm7Overtime,
+            sum(iharm_8_overtime)  iharm8Overtime,
+            sum(iharm_9_overtime)  iharm9Overtime,
+            sum(iharm_10_overtime)  iharm10Overtime,
+            sum(iharm_11_overtime)  iharm11Overtime,
+            sum(iharm_12_overtime)  iharm12Overtime,
+            sum(iharm_13_overtime)  iharm13Overtime,
+            sum(iharm_14_overtime)  iharm14Overtime,
+            sum(iharm_15_overtime)  iharm15Overtime,
+            sum(iharm_16_overtime)  iharm16Overtime,
+            sum(iharm_17_overtime)  iharm17Overtime,
+            sum(iharm_18_overtime)  iharm18Overtime,
+            sum(iharm_19_overtime)  iharm19Overtime,
+            sum(iharm_20_overtime)  iharm20Overtime,
+            sum(iharm_21_overtime)  iharm21Overtime,
+            sum(iharm_22_overtime)  iharm22Overtime,
+            sum(iharm_23_overtime)  iharm23Overtime,
+            sum(iharm_24_overtime)  iharm24Overtime,
+            sum(iharm_25_overtime)  iharm25Overtime,
+            sum(inuharm_1_overtime) inuharm1Overtime,
+            sum(inuharm_2_overtime) inuharm2Overtime,
+            sum(inuharm_3_overtime) inuharm3Overtime,
+            sum(inuharm_4_overtime) inuharm4Overtime,
+            sum(inuharm_5_overtime) inuharm5Overtime,
+            sum(inuharm_6_overtime) inuharm6Overtime,
+            sum(inuharm_7_overtime) inuharm7Overtime,
+            sum(inuharm_8_overtime) inuharm8Overtime,
+            sum(inuharm_9_overtime) inuharm9Overtime,
+            sum(inuharm_10_overtime) inuharm10Overtime,
+            sum(inuharm_11_overtime) inuharm11Overtime,
+            sum(inuharm_12_overtime) inuharm12Overtime,
+            sum(inuharm_13_overtime) inuharm13Overtime,
+            sum(inuharm_14_overtime) inuharm14Overtime,
+            sum(inuharm_15_overtime) inuharm15Overtime,
+            sum(inuharm_16_overtime) inuharm16Overtime,
+            sum(i_neg_overtime)  iNegOvertime
+        from
+            r_stat_limit_rate_d
+        where
+            time_id between #{statTime} and #{endTime}
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+        group by
+            my_index
+    </select>
+
+    <select id="getAllOverTimes" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO">
+        select
+            my_index as lineId,
+            SUM(freq_dev_overtime
+                    + flicker_overtime
+                    + voltage_dev_overtime
+                    + ubalance_overtime
+                    + uaberrance_overtime
+                    + i_neg_overtime
+                    + uharm_2_overtime + uharm_3_overtime + uharm_4_overtime + uharm_5_overtime + uharm_6_overtime + uharm_7_overtime + uharm_8_overtime + uharm_9_overtime + uharm_10_overtime + uharm_11_overtime + uharm_12_overtime + uharm_13_overtime + uharm_14_overtime + uharm_15_overtime + uharm_16_overtime + uharm_17_overtime + uharm_18_overtime + uharm_19_overtime + uharm_20_overtime + uharm_21_overtime + uharm_22_overtime + uharm_23_overtime + uharm_24_overtime + uharm_25_overtime
+                    + iharm_2_overtime + iharm_3_overtime + iharm_4_overtime + iharm_5_overtime + iharm_6_overtime + iharm_7_overtime + iharm_8_overtime + iharm_9_overtime + iharm_10_overtime + iharm_11_overtime + iharm_12_overtime + iharm_13_overtime + iharm_14_overtime + iharm_15_overtime + iharm_16_overtime + iharm_17_overtime + iharm_18_overtime + iharm_19_overtime + iharm_20_overtime + iharm_21_overtime + iharm_22_overtime + iharm_23_overtime + iharm_24_overtime + iharm_25_overtime
+                    + inuharm_1_overtime + inuharm_2_overtime + inuharm_3_overtime + inuharm_4_overtime + inuharm_5_overtime + inuharm_6_overtime + inuharm_7_overtime + inuharm_8_overtime + inuharm_9_overtime + inuharm_10_overtime + inuharm_11_overtime + inuharm_12_overtime + inuharm_13_overtime + inuharm_14_overtime + inuharm_15_overtime + inuharm_16_overtime
+            ) as allTime
+        from
+            r_stat_limit_rate_d
+        <where>
+            and time_id between #{statTime} and #{endTime}
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by
+            my_index
+    </select>
+</mapper>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDetailDMapper">
+
+
+</mapper>

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

@@ -0,0 +1,48 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.MainLineQueryParam;
+import com.njcn.harmonic.pojo.param.MainLineStatLimitRateDetailsQueryParam;
+import com.njcn.harmonic.pojo.param.TotalLimitStatisticsDetailsQueryParam;
+import com.njcn.harmonic.pojo.param.TotalLimitStatisticsParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 合格率统计日表(越限次数) 服务类
+ * </p>
+ *
+ * @author wr
+ * @since 2023-04-03
+ */
+public interface IRStatLimitRateDService extends IService<RStatLimitRateDPO> {
+
+    /**
+     * 获取指定日期的监测点超标详情
+     *
+     * @author cdf
+     * @date 2024/2/28
+     */
+    List<RStatLimitRateDPO> monitorIdsGetLimitRateInfo(String date, List<String> monitorIds);
+
+    List<RStatLimitRateDPO> getOverData(String lineId, String startTime, String endTime, Integer type);
+
+    Page<MainLineVO> mainLineList(MainLineQueryParam param);
+
+    List<MainLineStatLimitRateDetailsVO> mainLineStatLimitRateDetails(MainLineStatLimitRateDetailsQueryParam param);
+
+    TotalLimitTotalStatisticsVO totalLimitTotalStatisticsData(TotalLimitStatisticsParam param);
+
+    List<TotalLimitStatisticsVO> totalLimitStatisticsList(TotalLimitStatisticsParam param);
+
+    List<TotalLimitStatisticsDetailsVO> totalLimitStatisticsDetails(TotalLimitStatisticsDetailsQueryParam param);
+
+    TotalLimitTotalStatisticsVO gridSideLimitTotalStatisticsData(TotalLimitStatisticsParam param);
+
+    List<TotalLimitStatisticsVO> gridSideLimitStatisticsList(TotalLimitStatisticsParam param);
+
+}

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

@@ -0,0 +1,30 @@
+package com.njcn.harmonic.service;
+
+import cn.hutool.json.JSONArray;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.LimitCalendarQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentDayQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentQueryParam;
+import com.njcn.harmonic.pojo.param.LimitProbabilityQueryParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDetailDPO;
+import com.njcn.harmonic.pojo.vo.LimitCalendarVO;
+import com.njcn.harmonic.pojo.vo.LimitExtentVO;
+import com.njcn.harmonic.pojo.vo.LimitProbabilityVO;
+import com.njcn.harmonic.pojo.vo.LimitTimeProbabilityVO;
+
+import java.util.List;
+
+
+public interface IRStatLimitRateDetailDService extends IService<RStatLimitRateDetailDPO> {
+
+
+    List<LimitExtentVO> limitExtentData(LimitExtentQueryParam param);
+
+    JSONArray limitExtentDayData(LimitExtentDayQueryParam param);
+
+    List<LimitCalendarVO> limitCalendarData(LimitCalendarQueryParam param);
+
+    List<LimitProbabilityVO> limitProbabilityData(LimitProbabilityQueryParam param);
+
+    List<LimitTimeProbabilityVO> limitTimeProbabilityData(LimitProbabilityQueryParam param);
+}

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

@@ -33,7 +33,7 @@ import com.njcn.harmonic.pojo.vo.MonitorOverLimitVO;
 import com.njcn.harmonic.pojo.vo.OverAreaLimitVO;
 import com.njcn.harmonic.pojo.vo.OverAreaVO;
 import com.njcn.harmonic.pojo.vo.WarningSubstationVO;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.IAnalyzeService;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.supervision.api.UserLedgerFeignClient;

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

@@ -23,7 +23,10 @@ import com.njcn.harmonic.pojo.vo.hebeinorth.AssessDetailVo;
 import com.njcn.harmonic.pojo.vo.hebeinorth.AssessVo;
 import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationLevelVo;
 import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationVo;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataIDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataInharmVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataVDMapper;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.hebeinorth.IGridService;
 import com.njcn.harmonic.util.ComAssesUtil;
 import com.njcn.harmonic.util.TimeUtil;

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

@@ -12,7 +12,6 @@ import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.utils.PubUtils;
-import com.njcn.dataProcess.pojo.po.RStatDataHarmRateVD;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -20,7 +19,6 @@ import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.event.api.EventDetailFeignClient;
 import com.njcn.event.pojo.po.EventDetail;
-import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.harmonic.enums.HarmonicResponseEnum;
 import com.njcn.harmonic.mapper.*;
 import com.njcn.harmonic.pojo.QueryResultLimitVO;
@@ -33,8 +31,10 @@ import com.njcn.harmonic.pojo.vo.AssessEvaluation;
 import com.njcn.harmonic.pojo.vo.EventDetailVO;
 import com.njcn.harmonic.pojo.vo.HistoryDataResultVO;
 import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
+import com.njcn.harmonic.common.mapper.RStatDataHarmRateVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataIDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataVDMapper;
 import com.njcn.harmonic.service.HistoryResultService;
-import com.njcn.harmonic.service.IRStatDataVDService;
 import com.njcn.influx.imapper.CommonMapper;
 import com.njcn.influx.imapper.DataHarmRateVMapper;
 import com.njcn.influx.imapper.DataIMapper;
@@ -50,14 +50,11 @@ import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.utils.WebUtil;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

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

@@ -58,7 +58,7 @@ import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.vo.PollutionSubstationVO;
 import com.njcn.harmonic.pojo.vo.PollutionVO;
 import com.njcn.harmonic.pojo.vo.SubstationVo;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.PollutionSubstationService;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.supervision.api.UserLedgerFeignClient;

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

@@ -1,7 +1,7 @@
 package com.njcn.harmonic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.mapper.RStatDataVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataVDMapper;
 import com.njcn.harmonic.pojo.po.RStatDataVD;
 import com.njcn.harmonic.service.IRStatDataVDService;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,600 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.harmonic.pojo.param.MainLineQueryParam;
+import com.njcn.harmonic.pojo.param.MainLineStatLimitRateDetailsQueryParam;
+import com.njcn.harmonic.pojo.param.TotalLimitStatisticsDetailsQueryParam;
+import com.njcn.harmonic.pojo.param.TotalLimitStatisticsParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.service.IRStatLimitRateDService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 合格率统计日表(越限次数) 服务实现类
+ * </p>
+ *
+ * @author wr
+ * @since 2023-04-03
+ */
+@DS("sjzx")
+@RequiredArgsConstructor
+@Service
+public class RStatLimitRateDServiceImpl extends ServiceImpl<RStatLimitRateDMapper, RStatLimitRateDPO> implements IRStatLimitRateDService {
+
+    private final CsLineFeignClient csLineFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final DecimalFormat df = new DecimalFormat("#0.00");
+
+    private final String GRID_SIDE_DICT_CODE = "Grid_Side";
+
+    @Override
+    public List<RStatLimitRateDPO> monitorIdsGetLimitRateInfo(String date, List<String> monitorIds) {
+        return this.baseMapper.selectList(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .in(RStatLimitRateDPO::getLineId, monitorIds).eq(RStatLimitRateDPO::getTime, date).eq(RStatLimitRateDPO::getPhasicType, "T"));
+    }
+
+
+    @Override
+    public List<RStatLimitRateDPO> getOverData(String lineId, String startTime, String endTime, Integer type) {
+        QueryWrapper<RStatLimitRateDPO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .eq(RStatLimitRateDPO::getLineId, lineId)
+                .between(RStatLimitRateDPO::getTime, startTime, endTime)
+                .groupBy(RStatLimitRateDPO::getTime);
+        //频率偏差
+        if (type == 1) {
+            queryWrapper.select("time_id time,max(freq_dev_overtime) freq_dev_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getFreqDevOvertime, 0);
+        }
+        //电压偏差
+        else if (type == 2) {
+            queryWrapper.select("time_id time,max(voltage_dev_overtime) voltage_dev_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getVoltageDevOvertime, 0);
+        }
+        //长时闪变
+        else if (type == 3) {
+            queryWrapper.select("time_id time,max(flicker_overtime) flicker_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getFlickerOvertime, 0);
+        }
+        //电压总谐波畸变率
+        else if (type == 4) {
+            queryWrapper.select("time_id time,max(uaberrance_overtime) uaberrance_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getUaberranceOvertime, 0);
+        }
+        //负序电压不平衡度
+        else if (type == 5) {
+            queryWrapper.select("time_id time,max(ubalance_overtime) ubalance_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getUbalanceOvertime, 0);
+        }
+        //负序电流
+        else if (type == 6) {
+            queryWrapper.select("time_id time,max(i_neg_overtime) i_neg_overtime");
+            queryWrapper.lambda().gt(RStatLimitRateDPO::getINegOvertime, 0);
+        }
+        //谐波电压含有率
+        else if (type == 7) {
+            StringBuilder selectSql = new StringBuilder();
+            StringBuilder havingSql = new StringBuilder();
+            for (int i = 2; i <= 25; i++) {
+                selectSql.append("max(uharm_").append(i).append("_overtime) uharm_").append(i).append("_overtime,");
+                if (i == 25) {
+                    havingSql.append("uharm_").append(i).append("_overtime");
+                } else {
+                    havingSql.append("uharm_").append(i).append("_overtime + ");
+                }
+            }
+            selectSql.append("time_id time");
+            havingSql = new StringBuilder("sum(" + havingSql + ")");
+            queryWrapper.select(selectSql.toString()).having(havingSql.toString(), 0);
+        }
+        //谐波电流
+        else if (type == 8) {
+            StringBuilder selectSql = new StringBuilder();
+            StringBuilder havingSql = new StringBuilder();
+            for (int i = 2; i <= 25; i++) {
+                selectSql.append("max(iharm_").append(i).append("_overtime) iharm_").append(i).append("_overtime,");
+                if (i == 25) {
+                    havingSql.append("iharm_").append(i).append("_overtime");
+                } else {
+                    havingSql.append("iharm_").append(i).append("_overtime + ");
+                }
+            }
+            selectSql.append("time_id time");
+            havingSql = new StringBuilder("sum(" + havingSql + ")");
+            queryWrapper.select(selectSql.toString()).having(havingSql.toString(), 0);
+        }
+        //间谐波电压
+        else if (type == 9) {
+            StringBuilder selectSql = new StringBuilder();
+            StringBuilder havingSql = new StringBuilder();
+            for (int i = 1; i <= 16; i++) {
+                selectSql.append("max(inuharm_").append(i).append("_overtime) inuharm_").append(i).append("_overtime,");
+                if (i == 16) {
+                    havingSql.append("inuharm_").append(i).append("_overtime");
+                } else {
+                    havingSql.append("inuharm_").append(i).append("_overtime + ");
+                }
+            }
+            selectSql.append("time_id time");
+            havingSql = new StringBuilder("sum(" + havingSql + ")");
+            queryWrapper.select(selectSql.toString()).having(havingSql.toString(), 0);
+        }
+        return this.baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public Page<MainLineVO> mainLineList(MainLineQueryParam param) {
+        Page<MainLineVO> result = new Page<>();
+        result.setCurrent(param.getPageNum());
+        result.setSize(param.getPageSize());
+        String keywords = param.getKeywords();
+        List<String> keywordsLineIds = new ArrayList<>();
+        if (StrUtil.isNotBlank(keywords)) {
+            List<CsLinePO> lineList = csLineFeignClient.getLineByName(keywords).getData();
+            if (CollUtil.isEmpty(lineList)) {
+                return result;
+            }
+            keywordsLineIds = lineList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        }
+        // 根据监测点Id分组，再分页
+        Page<RStatLimitRateDPO> ratePage = this.page(new Page<RStatLimitRateDPO>(param.getPageNum(), param.getPageSize()), new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .in(CollUtil.isNotEmpty(keywordsLineIds), RStatLimitRateDPO::getLineId, keywordsLineIds)
+                .groupBy(RStatLimitRateDPO::getLineId)
+                .select(RStatLimitRateDPO::getLineId)
+        );
+        BeanUtil.copyProperties(ratePage, result);
+        List<RStatLimitRateDPO> records = ratePage.getRecords();
+        if (CollUtil.isEmpty(records)) {
+            return result;
+        }
+        List<MainLineVO> list = new ArrayList<>();
+        MainLineVO mainLineVO;
+        for (RStatLimitRateDPO record : records) {
+            String lineId = record.getLineId();
+            CsLinePO linePO = csLineFeignClient.getById(lineId).getData();
+            mainLineVO = new MainLineVO();
+            mainLineVO.setLineId(lineId);
+            if (linePO != null) {
+                mainLineVO.setLineName(linePO.getName());
+                if (linePO.getGovern().equals(0)) {
+                    mainLineVO.setGovern("未治理");
+                }
+                if (linePO.getGovern().equals(1)) {
+                    mainLineVO.setGovern("已治理");
+                }
+                mainLineVO.setObjType(linePO.getMonitorObj());
+                DictData dictData = dicDataFeignClient.getDicDataById(linePO.getMonitorObj()).getData();
+                if (dictData != null) {
+                    mainLineVO.setObjType(dictData.getName());
+                }
+            }
+            MainLineStatLimitRateDetailsQueryParam detailsQueryParam = new MainLineStatLimitRateDetailsQueryParam();
+            detailsQueryParam.setLineId(lineId);
+            detailsQueryParam.setSearchBeginTime(param.getSearchBeginTime());
+            detailsQueryParam.setSearchEndTime(param.getSearchEndTime());
+            List<MainLineStatLimitRateDetailsVO> detailsList = this.mainLineStatLimitRateDetails(detailsQueryParam);
+            List<String> problemList = new ArrayList<>();
+            for (MainLineStatLimitRateDetailsVO details : detailsList) {
+                JSONObject entries = JSONUtil.parseObj(details);
+                for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                    String key = entry.getKey();
+                    if (key.endsWith("Overtime")) {
+                        String value = entry.getValue().toString();
+                        // 值 >0 则表示该电能质量指标有问题
+                        Integer intValue = new Integer(value);
+                        if (intValue > 0) {
+                            String description = getDescription(key);
+                            if (StrUtil.isNotBlank(description)) {
+                                if (!problemList.contains(description)) {
+                                    problemList.add(description);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (CollUtil.isEmpty(problemList)) {
+                mainLineVO.setProblems("所有指标都合格");
+            } else {
+                mainLineVO.setProblems(CollUtil.join(problemList, "、"));
+            }
+
+            list.add(mainLineVO);
+        }
+        result.setRecords(list);
+        return result;
+    }
+
+    @Override
+    public List<MainLineStatLimitRateDetailsVO> mainLineStatLimitRateDetails(MainLineStatLimitRateDetailsQueryParam param) {
+
+        HttpResult<CsLinePO> lineResult = csLineFeignClient.getById(param.getLineId());
+        CsLinePO linePO = lineResult.getData();
+        if (linePO == null) {
+            return Collections.emptyList();
+        }
+        List<RStatLimitRateDPO> list = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .eq(RStatLimitRateDPO::getLineId, param.getLineId())
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+        return list.stream().map(item -> {
+            MainLineStatLimitRateDetailsVO vo = BeanUtil.copyProperties(item, MainLineStatLimitRateDetailsVO.class);
+            vo.setLineName(linePO.getName());
+            Integer lineInterval = linePO.getLineInterval();
+            JSONObject entries = JSONUtil.parseObj(vo);
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime")) {
+                    String value = entry.getValue().toString();
+                    Integer intValue = new Integer(value);
+                    // 总分钟 = 越限次数 * 间隔时间
+                    int minutes = intValue * lineInterval;
+                    entries.putOpt(key, minutes);
+                }
+            }
+            return BeanUtil.copyProperties(entries, MainLineStatLimitRateDetailsVO.class);
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public TotalLimitTotalStatisticsVO totalLimitTotalStatisticsData(TotalLimitStatisticsParam param) {
+        List<RStatLimitRateDPO> rateList = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+
+        TotalLimitTotalStatisticsVO statisticsVO = new TotalLimitTotalStatisticsVO();
+        int flickerTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getFlickerOvertime).sum();
+        int voltageDevTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getVoltageDevOvertime).sum();
+        int ubalanceTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getUbalanceOvertime).sum();
+        int iharmTotalTime = 0;
+        int uharmTotalTime = 0;
+        for (RStatLimitRateDPO rate : rateList) {
+            JSONObject entries = JSONUtil.parseObj(rate);
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime")) {
+                    String value = entry.getValue().toString();
+                    int intValue = new Integer(value);
+                    if (key.startsWith("uharm")) {
+                        uharmTotalTime += intValue;
+                    }
+                    if (key.startsWith("iharm")) {
+                        iharmTotalTime += intValue;
+                    }
+                }
+            }
+
+        }
+        int totalTime = flickerTotalTime + voltageDevTotalTime + ubalanceTotalTime + iharmTotalTime + uharmTotalTime;
+        if (totalTime == 0) {
+            return statisticsVO;
+        }
+        statisticsVO.setFlicker(calculatePercentage(flickerTotalTime, totalTime));
+        statisticsVO.setUharm(calculatePercentage(uharmTotalTime, totalTime));
+        statisticsVO.setIharm(calculatePercentage(iharmTotalTime, totalTime));
+        statisticsVO.setVoltageDev(calculatePercentage(voltageDevTotalTime, totalTime));
+        statisticsVO.setUbalance(calculatePercentage(ubalanceTotalTime, totalTime));
+        return statisticsVO;
+    }
+
+    @Override
+    public List<TotalLimitStatisticsVO> totalLimitStatisticsList(TotalLimitStatisticsParam param) {
+        List<TotalLimitStatisticsVO> result = new ArrayList<>();
+
+        List<RStatLimitRateDPO> rateList = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+        if (CollUtil.isEmpty(rateList)) {
+            return result;
+        }
+        Map<String, List<RStatLimitRateDPO>> lineMap = rateList.stream().collect(Collectors.groupingBy(RStatLimitRateDPO::getLineId));
+
+        List<CsLinePO> linePOList = csLineFeignClient.queryLineById(new ArrayList<>(lineMap.keySet())).getData();
+        if (CollUtil.isEmpty(linePOList)) {
+            return result;
+        }
+        TotalLimitStatisticsVO statisticsVO;
+        for (CsLinePO linePO : linePOList) {
+            statisticsVO = new TotalLimitStatisticsVO();
+            statisticsVO.setLineId(linePO.getLineId());
+            statisticsVO.setLineName(linePO.getName());
+            List<RStatLimitRateDPO> lineRateList = lineMap.get(linePO.getLineId());
+            int totalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getAllTime).sum();
+            int flickerTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getFlickerOvertime).sum();
+            int voltageDevTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getVoltageDevOvertime).sum();
+            int ubalanceTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getUbalanceOvertime).sum();
+            int uharm = 0;
+            int iharm = 0;
+            for (RStatLimitRateDPO item : lineRateList) {
+                JSONObject entries = JSONUtil.parseObj(item);
+                List<Integer> uharmList = new ArrayList<>();
+                List<Integer> iharmList = new ArrayList<>();
+                for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                    String key = entry.getKey();
+                    if (key.endsWith("Overtime")) {
+                        if (key.startsWith("uharm")) {
+                            String value = entry.getValue().toString();
+                            Integer intValue = new Integer(value);
+                            uharmList.add(intValue);
+                        }
+                        if (key.startsWith("iharm")) {
+                            String value = entry.getValue().toString();
+                            Integer intValue = new Integer(value);
+                            iharmList.add(intValue);
+                        }
+                    }
+                }
+                // 取最大值
+                uharm += uharmList.stream().max(Integer::compareTo).orElse(0);
+                iharm += iharmList.stream().max(Integer::compareTo).orElse(0);
+            }
+            if (totalTime == 0) {
+                statisticsVO.setFlicker(0.0);
+                statisticsVO.setVoltageDev(0.0);
+                statisticsVO.setUbalance(0.0);
+                statisticsVO.setUharm(0.0);
+                statisticsVO.setIharm(0.0);
+            } else {
+                statisticsVO.setFlicker(calculatePercentage(flickerTotalTime, totalTime));
+                statisticsVO.setVoltageDev(calculatePercentage(voltageDevTotalTime, totalTime));
+                statisticsVO.setUbalance(calculatePercentage(ubalanceTotalTime, totalTime));
+                statisticsVO.setUharm(calculatePercentage(uharm, totalTime));
+                statisticsVO.setIharm(calculatePercentage(iharm, totalTime));
+            }
+            result.add(statisticsVO);
+
+        }
+        return result;
+    }
+
+    @Override
+    public List<TotalLimitStatisticsDetailsVO> totalLimitStatisticsDetails(TotalLimitStatisticsDetailsQueryParam param) {
+
+        HttpResult<CsLinePO> lineResult = csLineFeignClient.getById(param.getLineId());
+        CsLinePO linePO = lineResult.getData();
+        if (linePO == null) {
+            return Collections.emptyList();
+        }
+        List<RStatLimitRateDPO> list = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .eq(RStatLimitRateDPO::getLineId, param.getLineId())
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+        return list.stream().map(item -> {
+            MainLineStatLimitRateDetailsVO vo = BeanUtil.copyProperties(item, MainLineStatLimitRateDetailsVO.class);
+            vo.setLineName(linePO.getName());
+            Integer allTime = item.getAllTime();
+            JSONObject entries = JSONUtil.parseObj(vo);
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime") && allTime != 0) {
+                    String value = entry.getValue().toString();
+                    int intValue = new Integer(value);
+                    // 占比 = 越限次数 / 总次数 * 100
+                    double proportion = calculatePercentage(intValue, allTime);
+                    entries.putOpt(key, proportion);
+                }
+            }
+            return BeanUtil.copyProperties(entries, TotalLimitStatisticsDetailsVO.class);
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public TotalLimitTotalStatisticsVO gridSideLimitTotalStatisticsData(TotalLimitStatisticsParam param) {
+        TotalLimitTotalStatisticsVO statisticsVO = new TotalLimitTotalStatisticsVO();
+        // 获取电网侧监测点
+        DictData dictData = dicDataFeignClient.getDicDataByCode(GRID_SIDE_DICT_CODE).getData();
+        CsLinePO queryParam = new CsLinePO();
+        queryParam.setPosition(dictData.getId());
+        List<CsLinePO> linePOList = csLineFeignClient.list(queryParam).getData();
+        List<String> lineIds = linePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        if (CollUtil.isEmpty(lineIds)) {
+            return statisticsVO;
+        }
+        List<RStatLimitRateDPO> rateList = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .in(RStatLimitRateDPO::getLineId, lineIds)
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+
+
+        int flickerTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getFlickerOvertime).sum();
+        int voltageDevTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getVoltageDevOvertime).sum();
+        int ubalanceTotalTime = rateList.stream().mapToInt(RStatLimitRateDPO::getUbalanceOvertime).sum();
+        int iharmTotalTime = 0;
+        int uharmTotalTime = 0;
+        for (RStatLimitRateDPO rate : rateList) {
+            JSONObject entries = JSONUtil.parseObj(rate);
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime")) {
+                    String value = entry.getValue().toString();
+                    int intValue = new Integer(value);
+                    if (key.startsWith("uharm")) {
+                        uharmTotalTime += intValue;
+                    }
+                    if (key.startsWith("iharm")) {
+                        iharmTotalTime += intValue;
+                    }
+                }
+            }
+
+        }
+        int totalTime = flickerTotalTime + voltageDevTotalTime + ubalanceTotalTime + iharmTotalTime + uharmTotalTime;
+        if (totalTime == 0) {
+            return statisticsVO;
+        }
+        statisticsVO.setFlicker(calculatePercentage(flickerTotalTime, totalTime));
+        statisticsVO.setUharm(calculatePercentage(uharmTotalTime, totalTime));
+        statisticsVO.setIharm(calculatePercentage(iharmTotalTime, totalTime));
+        statisticsVO.setVoltageDev(calculatePercentage(voltageDevTotalTime, totalTime));
+        statisticsVO.setUbalance(calculatePercentage(ubalanceTotalTime, totalTime));
+        return statisticsVO;
+    }
+
+    @Override
+    public List<TotalLimitStatisticsVO> gridSideLimitStatisticsList(TotalLimitStatisticsParam param) {
+        List<TotalLimitStatisticsVO> result = new ArrayList<>();
+        // 获取电网侧监测点
+        DictData dictData = dicDataFeignClient.getDicDataByCode(GRID_SIDE_DICT_CODE).getData();
+        CsLinePO queryParam = new CsLinePO();
+        queryParam.setPosition(dictData.getId());
+        List<CsLinePO> linePOList = csLineFeignClient.list(queryParam).getData();
+        List<String> lineIds = linePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        if (CollUtil.isEmpty(lineIds)) {
+            return result;
+        }
+        List<RStatLimitRateDPO> rateList = this.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .in(RStatLimitRateDPO::getLineId, lineIds)
+                .eq(RStatLimitRateDPO::getPhasicType, "T")
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDPO::getTime)
+        );
+        if (CollUtil.isEmpty(rateList)) {
+            return result;
+        }
+        Map<String, List<RStatLimitRateDPO>> lineMap = rateList.stream().collect(Collectors.groupingBy(RStatLimitRateDPO::getLineId));
+        Map<String, CsLinePO> linePOMap = linePOList.stream().collect(Collectors.toMap(CsLinePO::getLineId, csLinePO -> csLinePO));
+        List<CsLinePO> lineList = new ArrayList<>();
+        for (String lineId : lineMap.keySet()) {
+            CsLinePO linePO = linePOMap.getOrDefault(lineId, null);
+            if (linePO != null) {
+                lineList.add(linePO);
+            }
+        }
+        if (CollUtil.isEmpty(lineList)) {
+            return result;
+        }
+        TotalLimitStatisticsVO statisticsVO;
+        for (CsLinePO linePO : lineList) {
+            statisticsVO = new TotalLimitStatisticsVO();
+            statisticsVO.setLineId(linePO.getLineId());
+            statisticsVO.setLineName(linePO.getName());
+            List<RStatLimitRateDPO> lineRateList = lineMap.get(linePO.getLineId());
+            int totalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getAllTime).sum();
+            int flickerTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getFlickerOvertime).sum();
+            int voltageDevTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getVoltageDevOvertime).sum();
+            int ubalanceTotalTime = lineRateList.stream().mapToInt(RStatLimitRateDPO::getUbalanceOvertime).sum();
+            int uharm = 0;
+            int iharm = 0;
+            for (RStatLimitRateDPO item : lineRateList) {
+                JSONObject entries = JSONUtil.parseObj(item);
+                List<Integer> uharmList = new ArrayList<>();
+                List<Integer> iharmList = new ArrayList<>();
+                for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                    String key = entry.getKey();
+                    if (key.endsWith("Overtime")) {
+                        if (key.startsWith("uharm")) {
+                            String value = entry.getValue().toString();
+                            Integer intValue = new Integer(value);
+                            uharmList.add(intValue);
+                        }
+                        if (key.startsWith("iharm")) {
+                            String value = entry.getValue().toString();
+                            Integer intValue = new Integer(value);
+                            iharmList.add(intValue);
+                        }
+                    }
+                }
+                // 取最大值
+                uharm += uharmList.stream().max(Integer::compareTo).orElse(0);
+                iharm += iharmList.stream().max(Integer::compareTo).orElse(0);
+            }
+            if (totalTime == 0) {
+                statisticsVO.setFlicker(0.0);
+                statisticsVO.setVoltageDev(0.0);
+                statisticsVO.setUbalance(0.0);
+                statisticsVO.setUharm(0.0);
+                statisticsVO.setIharm(0.0);
+            } else {
+                statisticsVO.setFlicker(calculatePercentage(flickerTotalTime, totalTime));
+                statisticsVO.setVoltageDev(calculatePercentage(voltageDevTotalTime, totalTime));
+                statisticsVO.setUbalance(calculatePercentage(ubalanceTotalTime, totalTime));
+                statisticsVO.setUharm(calculatePercentage(uharm, totalTime));
+                statisticsVO.setIharm(calculatePercentage(iharm, totalTime));
+            }
+            result.add(statisticsVO);
+
+        }
+        return result;
+    }
+
+    private String getDescription(String key) {
+        if (StrUtil.equals(key, "flickerOvertime")) {
+            return "闪变越限超标";
+        }
+        if (StrUtil.equals(key, "freqDevOvertime")) {
+            return "频率偏差超标";
+        }
+        if (StrUtil.equals(key, "voltageDevOvertime")) {
+            return "电压偏差超标";
+        }
+        if (StrUtil.equals(key, "ubalanceOvertime")) {
+            return "三相电压不平衡超标";
+        }
+        // 电压
+        if (StrUtil.startWith(key, "uharm")) {
+            // 从 key 中提取数字 2
+            String number = key.substring(5, key.indexOf("Overtime"));
+            return number + "次谐波电压";
+        }
+        // 电流
+        if (StrUtil.startWith(key, "iharm")) {
+            // 从 key 中提取数字
+            String number = key.substring(5, key.indexOf("Overtime"));
+            return number + "次谐波电流";
+        }
+        return null;
+    }
+
+
+    private double calculatePercentage(double part, double total) {
+        return Double.parseDouble(df.format(BigDecimal.valueOf(part / total * 100.0)
+                .setScale(2, RoundingMode.HALF_UP).doubleValue()));
+    }
+
+}

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

@@ -0,0 +1,551 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Pair;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.pq.api.OverLimitClient;
+import com.njcn.harmonic.pojo.param.LimitCalendarQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentDayQueryParam;
+import com.njcn.harmonic.pojo.param.LimitExtentQueryParam;
+import com.njcn.harmonic.pojo.param.LimitProbabilityQueryParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDetailDPO;
+import com.njcn.harmonic.pojo.vo.LimitCalendarVO;
+import com.njcn.harmonic.pojo.vo.LimitExtentVO;
+import com.njcn.harmonic.pojo.vo.LimitProbabilityVO;
+import com.njcn.harmonic.pojo.vo.LimitTimeProbabilityVO;
+import com.njcn.harmonic.mapper.RStatLimitRateDetailDMapper;
+import com.njcn.harmonic.service.IRStatLimitRateDService;
+import com.njcn.harmonic.service.IRStatLimitRateDetailDService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@DS("sjzx")
+@RequiredArgsConstructor
+@Service
+public class RStatLimitRateDetailDServiceImpl extends ServiceImpl<RStatLimitRateDetailDMapper, RStatLimitRateDetailDPO> implements IRStatLimitRateDetailDService {
+
+    private final CsLineFeignClient csLineFeignClient;
+    private final OverLimitClient overLimitClient;
+    private final IRStatLimitRateDService rStatLimitRateDService;
+
+    private final DecimalFormat df = new DecimalFormat("#0.00");
+
+    static Map<String, String> indexMap = new HashMap<>();
+    static List<List<Integer>> timePeriodList = new ArrayList<>();
+    static List<List<Integer>> extentPeriodList = new ArrayList<>();
+
+    static {
+        indexMap.put("flicker", "闪变");
+        indexMap.put("uharm", "谐波电压");
+        indexMap.put("iharm", "谐波电流");
+        indexMap.put("ubalance", "三相电压不平衡度");
+        indexMap.put("voltageDev", "电压偏差");
+        indexMap.put("freqDev", "频率偏差");
+
+        timePeriodList.add(Arrays.asList(0, 8));
+        timePeriodList.add(Arrays.asList(8, 12));
+        timePeriodList.add(Arrays.asList(12, 14));
+        timePeriodList.add(Arrays.asList(14, 18));
+        timePeriodList.add(Arrays.asList(18, 24));
+
+        extentPeriodList.add(Arrays.asList(0, 20));
+        extentPeriodList.add(Arrays.asList(20, 40));
+        extentPeriodList.add(Arrays.asList(40, 60));
+        extentPeriodList.add(Arrays.asList(60, 80));
+        extentPeriodList.add(Arrays.asList(80, 100));
+    }
+
+    @Override
+    public List<LimitExtentVO> limitExtentData(LimitExtentQueryParam param) {
+        List<LimitExtentVO> result = new ArrayList<>();
+        LimitExtentVO flicker = new LimitExtentVO();
+        flicker.setCode("flicker");
+        flicker.setName(indexMap.get(flicker.getCode()));
+        LimitExtentVO uharm = new LimitExtentVO();
+        uharm.setCode("uharm");
+        uharm.setName(indexMap.get(uharm.getCode()));
+        LimitExtentVO iharm = new LimitExtentVO();
+        iharm.setCode("iharm");
+        iharm.setName(indexMap.get(iharm.getCode()));
+        LimitExtentVO voltageDev = new LimitExtentVO();
+        voltageDev.setCode("voltageDev");
+        voltageDev.setName(indexMap.get(voltageDev.getCode()));
+        LimitExtentVO ubalance = new LimitExtentVO();
+        ubalance.setCode("ubalance");
+        ubalance.setName(indexMap.get(ubalance.getCode()));
+        List<RStatLimitRateDetailDPO> detailList = this.list(new LambdaQueryWrapper<RStatLimitRateDetailDPO>()
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDetailDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDetailDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDetailDPO::getTime)
+        );
+        if (CollUtil.isNotEmpty(detailList)) {
+            List<String> lineIds = detailList.stream().map(RStatLimitRateDetailDPO::getLineId).distinct().collect(Collectors.toList());
+            List<Overlimit> overlimitList = overLimitClient.getOverLimitByLineIds(lineIds).getData();
+
+            Map<String, Pair<Float, RStatLimitRateDetailDPO>> findResult = findMaxValueHandle(detailList);
+            // 闪变
+            Pair<Float, RStatLimitRateDetailDPO> flickerResult = findResult.get(flicker.getCode());
+            setLimitExtentInfo(flicker, flickerResult);
+            // 电压偏差
+            Pair<Float, RStatLimitRateDetailDPO> voltageDevResult = findResult.get(voltageDev.getCode());
+            setLimitExtentInfo(voltageDev, voltageDevResult);
+            // 谐波电压
+            String uharmKey = findResult.keySet().stream().filter(code -> code.startsWith("uharm")).findFirst().orElse("uharm");
+            Pair<Float, RStatLimitRateDetailDPO> uharmResult = findResult.get(uharmKey);
+            setLimitExtentInfo(uharm, uharmResult);
+            uharm.setCode(uharmKey);
+            String iharmKey = findResult.keySet().stream().filter(code -> code.startsWith("iharm")).findFirst().orElse("iharm");
+            // 谐波电流
+            Pair<Float, RStatLimitRateDetailDPO> iharmResult = findResult.get(iharmKey);
+            setLimitExtentInfo(iharm, iharmResult);
+            iharm.setCode(iharmKey);
+            // 电压三相不平衡
+            Pair<Float, RStatLimitRateDetailDPO> ubalanceResult = findResult.get(ubalance.getCode());
+            setLimitExtentInfo(ubalance, ubalanceResult);
+
+            if (CollUtil.isNotEmpty(overlimitList)) {
+                // 取所有监测点中的最大闪变限值，作为闪变国际限值
+                float flickerMaxOverlimit = (float) overlimitList.stream().mapToDouble(Overlimit::getFlicker).max().orElse(0.0F);
+                float voltageDevMaxOverlimit = (float) overlimitList.stream().mapToDouble(Overlimit::getVoltageDev).max().orElse(0.0F);
+                float ubalanceMaxOverlimit = (float) overlimitList.stream().mapToDouble(Overlimit::getUbalance).max().orElse(0.0F);
+                float iharmMaxOverlimit = 0.0F;
+                float uharmMaxOverlimit = 0.0F;
+                for (Overlimit overlimit : overlimitList) {
+                    JSONObject entries = JSONUtil.parseObj(overlimit);
+                    for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                        String key = entry.getKey();
+                        if (key.startsWith("uharm")) {
+                            Object value = entry.getValue();
+                            if (value instanceof Number) {
+                                uharmMaxOverlimit = Math.max(uharmMaxOverlimit, ((Number) value).floatValue());
+                            }
+                        } else if (key.startsWith("iharm")) {
+                            Object value = entry.getValue();
+                            if (value instanceof Number) {
+                                iharmMaxOverlimit = Math.max(iharmMaxOverlimit, ((Number) value).floatValue());
+                            }
+                        }
+
+                    }
+                }
+                flicker.setInternationalValue(flickerMaxOverlimit);
+                voltageDev.setInternationalValue(voltageDevMaxOverlimit);
+                ubalance.setInternationalValue(ubalanceMaxOverlimit);
+                iharm.setInternationalValue(iharmMaxOverlimit);
+                uharm.setInternationalValue(uharmMaxOverlimit);
+            }
+        }
+        result.add(flicker);
+        result.add(uharm);
+        result.add(iharm);
+        result.add(voltageDev);
+        result.add(ubalance);
+        return result;
+    }
+
+    @Override
+    public JSONArray limitExtentDayData(LimitExtentDayQueryParam param) {
+        List<RStatLimitRateDetailDPO> records = this.page(new Page<>(1, 1),
+                new LambdaQueryWrapper<RStatLimitRateDetailDPO>()
+                        .eq(RStatLimitRateDetailDPO::getLineId, param.getLineId())
+                        .eq(RStatLimitRateDetailDPO::getTime, param.getTime())
+
+        ).getRecords();
+        String code = param.getCode();
+        if (CollUtil.isNotEmpty(records)) {
+            RStatLimitRateDetailDPO detail = records.get(0);
+            JSONObject entries = JSONUtil.parseObj(detail);
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime")) {
+                    Object value = entry.getValue();
+                    if (StrUtil.equals(code, key)) {
+                        return JSONUtil.parseArray(value);
+                    } else if (key.startsWith(code)) {
+                        return JSONUtil.parseArray(value);
+                    }
+
+                }
+            }
+        }
+        return JSONUtil.createArray();
+    }
+
+    @Override
+    public List<LimitCalendarVO> limitCalendarData(LimitCalendarQueryParam param) {
+        List<LimitCalendarVO> result = new ArrayList<>();
+        List<RStatLimitRateDetailDPO> detailList = this.list(new LambdaQueryWrapper<RStatLimitRateDetailDPO>()
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDetailDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDetailDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDetailDPO::getTime)
+        );
+        if (CollUtil.isEmpty(detailList)) {
+            return result;
+        }
+        Map<LocalDate, List<RStatLimitRateDetailDPO>> detailMap = detailList.stream().collect(Collectors.groupingBy(RStatLimitRateDetailDPO::getTime));
+        LimitCalendarVO calendarVO;
+        for (Map.Entry<LocalDate, List<RStatLimitRateDetailDPO>> entry : detailMap.entrySet()) {
+            calendarVO = new LimitCalendarVO();
+            LocalDate time = entry.getKey();
+            calendarVO.setTime(time);
+            int status = 0;
+            List<String> items = new ArrayList<>();
+            List<RStatLimitRateDetailDPO> dayDetailList = entry.getValue();
+            for (RStatLimitRateDetailDPO detail : dayDetailList) {
+                String lineId = detail.getLineId();
+                List<Overlimit> overlimitList = overLimitClient.getOverLimitByLineIds(Collections.singletonList(lineId)).getData();
+                Overlimit overlimit = overlimitList.stream().findFirst().orElse(null);
+                JSONObject entries = JSONUtil.parseObj(detail);
+                for (Map.Entry<String, Object> dayEntry : entries.entrySet()) {
+                    String key = dayEntry.getKey();
+                    if (key.endsWith("Overtime")) {
+                        Object data = dayEntry.getValue();
+                        // 有数据有越限
+                        if (ObjectUtil.isNotEmpty(data)) {
+                            status = 1;
+                            String description = getDescription(key);
+                            if (StrUtil.isNotBlank(description) && !items.contains(description)) {
+                                items.add(description);
+                            }
+                            float maxValue = parseMaxValueFromJsonArray(data);
+                            if (overlimit != null) {
+                                JSONObject overlimitJSON = JSONUtil.parseObj(overlimit);
+                                String itemKey = StrUtil.sub(key, 0, key.length() - 8);
+                                float limitValue = overlimitJSON.getFloat(itemKey);
+                                if (limitValue != 0) {
+                                    double overlimitPercent = calculatePercentage(maxValue - limitValue, limitValue);
+                                    if (overlimitPercent >= 80) {
+                                        status = 2;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            calendarVO.setItems(items);
+            calendarVO.setStatus(status);
+            result.add(calendarVO);
+        }
+        result.sort(Comparator.comparing(LimitCalendarVO::getTime));
+        return result;
+    }
+
+    @Override
+    public List<LimitProbabilityVO> limitProbabilityData(LimitProbabilityQueryParam param) {
+        List<LimitProbabilityVO> result = new ArrayList<>();
+        List<RStatLimitRateDetailDPO> detailList = this.list(new LambdaQueryWrapper<RStatLimitRateDetailDPO>()
+                .eq(RStatLimitRateDetailDPO::getLineId, param.getLineId())
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDetailDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDetailDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDetailDPO::getTime)
+        );
+        CsLinePO linePO = csLineFeignClient.getById(param.getLineId()).getData();
+        List<Overlimit> overlimitList = overLimitClient.getOverLimitByLineIds(Collections.singletonList(linePO.getLineId())).getData();
+        JSONObject overlimitJSON = null;
+        if (CollUtil.isNotEmpty(overlimitList)) {
+            overlimitJSON = JSONUtil.parseObj(overlimitList.get(0));
+        }
+        LimitProbabilityVO probabilityVO;
+        for (Map.Entry<String, String> indexEntry : indexMap.entrySet()) {
+            String indexCode = indexEntry.getKey();
+            probabilityVO = new LimitProbabilityVO();
+            probabilityVO.setIndexName(indexEntry.getValue());
+            probabilityVO.setIndexCode(indexCode);
+            probabilityVO.setLineId(linePO.getLineId());
+            probabilityVO.setLineName(linePO.getName());
+            // 计算越限程度
+            List<Double> extentValuesList = new ArrayList<>();
+            for (RStatLimitRateDetailDPO detail : detailList) {
+                JSONObject entries = JSONUtil.parseObj(detail);
+                for (Map.Entry<String, Object> dayEntry : entries.entrySet()) {
+                    String key = dayEntry.getKey();
+                    if (key.endsWith("Overtime") && key.startsWith(indexCode)) {
+                        double extentValue = 0;
+                        Object data = dayEntry.getValue();
+                        // 有数据有越限
+                        if (ObjectUtil.isNotEmpty(data)) {
+                            float maxValue = parseMaxValueFromJsonArray(data);
+                            if (overlimitJSON != null) {
+                                String itemKey = StrUtil.sub(key, 0, key.length() - 8);
+                                double limitValue = overlimitJSON.getDouble(itemKey);
+                                if (limitValue != 0) {
+                                    extentValue = calculatePercentage(maxValue - limitValue, limitValue);
+
+                                }
+                            }
+                        }
+                        extentValuesList.add(extentValue);
+                    }
+                }
+
+            }
+            List<Map<Integer, Integer>> extentGrades = new ArrayList<>();
+            for (int i = 0; i < extentPeriodList.size(); i++) {
+                Map<Integer, Integer> grade = new HashMap<>();
+                int times = 0;
+                for (Double extentValue : extentValuesList) {
+                    List<Integer> period = extentPeriodList.get(i);
+                    Integer start = period.get(0);
+                    Integer end = period.get(1);
+                    if (extentValue > start && extentValue <= end) {
+                        times++;
+                    }
+                }
+                grade.put(i, times);
+                extentGrades.add(grade);
+            }
+            probabilityVO.setExtentGrades(extentGrades);
+            result.add(probabilityVO);
+        }
+        return result;
+    }
+
+    @Override
+    public List<LimitTimeProbabilityVO> limitTimeProbabilityData(LimitProbabilityQueryParam param) {
+
+        List<LimitTimeProbabilityVO> result = new ArrayList<>();
+        List<RStatLimitRateDetailDPO> detailList = this.list(new LambdaQueryWrapper<RStatLimitRateDetailDPO>()
+                .eq(RStatLimitRateDetailDPO::getLineId, param.getLineId())
+                .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RStatLimitRateDetailDPO::getTime, param.getSearchBeginTime())
+                .le(StrUtil.isNotBlank(param.getSearchEndTime()), RStatLimitRateDetailDPO::getTime, param.getSearchEndTime())
+                .orderByAsc(RStatLimitRateDetailDPO::getTime)
+        );
+        CsLinePO linePO = csLineFeignClient.getById(param.getLineId()).getData();
+
+        LimitTimeProbabilityVO timeProbabilityVO;
+        JSONArray detailJSONArray = null;
+        if (CollUtil.isNotEmpty(detailList)) {
+            detailJSONArray = JSONUtil.parseArray(detailList);
+        }
+        for (Map.Entry<String, String> entry : indexMap.entrySet()) {
+            String indexCode = entry.getKey();
+            for (List<Integer> period : timePeriodList) {
+                timeProbabilityVO = new LimitTimeProbabilityVO();
+                timeProbabilityVO.setLineId(linePO.getLineId());
+                timeProbabilityVO.setLineName(linePO.getName());
+                timeProbabilityVO.setIndexName(entry.getValue());
+                timeProbabilityVO.setIndexCode(indexCode);
+                int start = period.get(0);
+                int end = period.get(1);
+                timeProbabilityVO.setTimePeriod(start + "时-" + end + "时");
+                int times = 0;
+                if (CollUtil.isNotEmpty(detailJSONArray)) {
+                    for (int i = 0; i < detailJSONArray.size(); i++) {
+                        JSONObject detail = detailJSONArray.getJSONObject(i);
+                        // 获取包含的指标key
+                        List<String> includeKeys = detail.keySet().stream().filter(f -> f.startsWith(indexCode)).collect(Collectors.toList());
+                        for (String key : includeKeys) {
+                            // 获取指标越限数据
+                            // [{"time": "17:10:00,17:20:00,17:30:00", "value": "7.1092,7.1092,7.1093", "phasic": "A", "valueType": "CP95"}, {"time": "17:10:00,17:20:00,17:30:00", "value": "7.8081,7.808,7.8081", "phasic": "C", "valueType": "CP95"}, {"time": "17:10:00,17:20:00,17:30:00", "value": "7.5095,7.5095,7.5095", "phasic": "B", "valueType": "CP95"}]
+                            JSONArray values = detail.getJSONArray(key);
+                            if (CollUtil.isNotEmpty(values)) {
+                                // 取出第一个数据
+                                JSONObject value = values.getJSONObject(0);
+                                // 获取时间
+                                String time = value.getStr("time");
+                                for (String t : StrUtil.split(time, StrUtil.COMMA)) {
+                                    // 判断在时间段内，次数加一
+                                    int hour = Integer.parseInt(t.substring(0, 2));
+                                    if (hour >= start && hour < end) {
+                                        times++;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                timeProbabilityVO.setTimes(times);
+                result.add(timeProbabilityVO);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 设置LimitExtentVO的最大值和相关信息
+     */
+    private void setLimitExtentInfo(LimitExtentVO limitExtentVO, Pair<Float, RStatLimitRateDetailDPO> result) {
+        float maxValue = result.getKey();
+        limitExtentVO.setMaxValue(maxValue);
+        RStatLimitRateDetailDPO maxDetail = result.getValue();
+        if (maxDetail != null) {
+            limitExtentVO.setTime(maxDetail.getTime());
+            CsLinePO maxLinePO = csLineFeignClient.getById(maxDetail.getLineId()).getData();
+            if (maxLinePO != null) {
+                limitExtentVO.setLineName(maxLinePO.getName());
+                limitExtentVO.setLineId(maxLinePO.getLineId());
+            }
+        }
+    }
+
+    /**
+     * 查找数据中的最大值及其对应的记录
+     *
+     * @param detailList 数据列表
+     * @return 包含最大值和对应记录的Pair对象
+     */
+    private Map<String, Pair<Float, RStatLimitRateDetailDPO>> findMaxValueHandle(List<RStatLimitRateDetailDPO> detailList) {
+
+        Map<String, Pair<Float, RStatLimitRateDetailDPO>> result = new HashMap<>();
+
+        RStatLimitRateDetailDPO flickerMaxDetail = null;
+        float flickerMaxValue = 0.0000F;
+
+        RStatLimitRateDetailDPO voltageDevMaxDetail = null;
+        float voltageDevMaxValue = 0.0000F;
+        RStatLimitRateDetailDPO ubalanceMaxDetail = null;
+        float ubalanceMaxValue = 0.0000F;
+
+        RStatLimitRateDetailDPO uharmMaxDetail = null;
+        float uharmMaxValue = 0.0000F;
+        String uharmMaxKey = ""; // 记录uharm最大值对应的key
+        RStatLimitRateDetailDPO iharmMaxDetail = null;
+        float iharmMaxValue = 0.0000F;
+        String iharmMaxKey = ""; // 记录iharm最大值对应的key
+
+        for (RStatLimitRateDetailDPO po : detailList) {
+            String flickerOvertime = po.getFlickerOvertime();
+            String voltageDevOvertime = po.getVoltageDevOvertime();
+            String ubalanceOvertime = po.getUbalanceOvertime();
+            if (StrUtil.isNotBlank(flickerOvertime)) {
+                float dayFlickerMaxValue = parseMaxValueFromJsonArray(flickerOvertime);
+                if (dayFlickerMaxValue > flickerMaxValue) {
+                    flickerMaxValue = dayFlickerMaxValue;
+                    flickerMaxDetail = po;
+                }
+            }
+            if (StrUtil.isNotBlank(voltageDevOvertime)) {
+                float dayVoltageDevMaxValue = parseMaxValueFromJsonArray(voltageDevOvertime);
+                if (dayVoltageDevMaxValue > voltageDevMaxValue) {
+                    voltageDevMaxValue = dayVoltageDevMaxValue;
+                    voltageDevMaxDetail = po;
+                }
+            }
+            if (StrUtil.isNotBlank(ubalanceOvertime)) {
+                float dayUbalanceMaxValue = parseMaxValueFromJsonArray(ubalanceOvertime);
+                if (dayUbalanceMaxValue > ubalanceMaxValue) {
+                    ubalanceMaxValue = dayUbalanceMaxValue;
+                    ubalanceMaxDetail = po;
+                }
+            }
+            JSONObject entries = JSONUtil.parseObj(po);
+            float dayUharmMaxValue = 0.0000F;
+            String dayUharmMaxKey = ""; // 当前记录中uharm的最大值key
+            float dayIharmMaxValue = 0.0000F;
+            String dayIharmMaxKey = ""; // 当前记录中iharm的最大值key
+
+            for (Map.Entry<String, Object> entry : entries.entrySet()) {
+                String key = entry.getKey();
+                if (key.endsWith("Overtime")) {
+                    if (key.startsWith("uharm")) {
+                        Object value = entry.getValue();
+                        if (ObjectUtil.isNotEmpty(value)) {
+                            float timeMaxValue = parseMaxValueFromJsonArray(value);
+                            // 取次数最大的未当天的最大值
+                            dayUharmMaxValue = Math.max(dayUharmMaxValue, timeMaxValue);
+                            dayUharmMaxKey = key;
+                        }
+                    }
+                    if (key.startsWith("iharm")) {
+                        Object value = entry.getValue();
+                        if (ObjectUtil.isNotEmpty(value)) {
+                            float timeMaxValue = parseMaxValueFromJsonArray(value);
+                            // 取次数最大的为当天的最大值
+                            dayIharmMaxValue = Math.max(dayIharmMaxValue, timeMaxValue);
+                            dayIharmMaxKey = key;
+                        }
+                    }
+                }
+            }
+            if (dayUharmMaxValue > uharmMaxValue) {
+                uharmMaxValue = dayUharmMaxValue;
+                uharmMaxDetail = po;
+                uharmMaxKey = dayUharmMaxKey; // 记录产生最大值的key
+            }
+            if (dayIharmMaxValue > iharmMaxValue) {
+                iharmMaxValue = dayIharmMaxValue;
+                iharmMaxDetail = po;
+                iharmMaxKey = dayIharmMaxKey; // 记录产生最大值的key
+            }
+        }
+        result.put("flicker", Pair.of(flickerMaxValue, flickerMaxDetail));
+        result.put("voltageDev", Pair.of(voltageDevMaxValue, voltageDevMaxDetail));
+        result.put("ubalance", Pair.of(ubalanceMaxValue, ubalanceMaxDetail));
+        result.put(uharmMaxKey.isEmpty() ? "uharm" : uharmMaxKey, Pair.of(uharmMaxValue, uharmMaxDetail));
+        result.put(iharmMaxKey.isEmpty() ? "iharm" : iharmMaxKey, Pair.of(iharmMaxValue, iharmMaxDetail));
+
+        return result;
+    }
+
+    /**
+     * 从JSON数组字符串中解析出最大值
+     *
+     * @param value JSON数组字符串
+     * @return 解析出的最大值
+     */
+    private float parseMaxValueFromJsonArray(Object value) {
+        JSONArray overtimeArray = JSONUtil.parseArray(value);
+        float maxValue = 0.0000F;
+        for (Object data : overtimeArray) {
+            JSONObject entries = JSONUtil.parseObj(data);
+            String values = entries.getStr("value");
+            float currentValue = (float) StrUtil.split(values, StrUtil.COMMA)
+                    .stream()
+                    .mapToDouble(Float::parseFloat)
+                    .max()
+                    .orElse(0.0000F);
+            maxValue = Math.max(maxValue, currentValue);
+        }
+
+        return maxValue;
+    }
+
+    private String getDescription(String key) {
+        if (StrUtil.equals(key, "flickerOvertime")) {
+            return "闪变越限";
+        }
+        if (StrUtil.equals(key, "freqDevOvertime")) {
+            return "频率偏差越限";
+        }
+        if (StrUtil.equals(key, "voltageDevOvertime")) {
+            return "电压偏差越限";
+        }
+        if (StrUtil.equals(key, "ubalanceOvertime")) {
+            return "三相电压不平衡越限";
+        }
+        // 电压
+        if (StrUtil.startWith(key, "uharm")) {
+            return "谐波电压越限";
+        }
+        // 电流
+        if (StrUtil.startWith(key, "iharm")) {
+            return "谐波电流越限";
+        }
+        return null;
+    }
+
+    private double calculatePercentage(double part, double total) {
+        return Double.parseDouble(df.format(BigDecimal.valueOf(part / total * 100.0)
+                .setScale(2, RoundingMode.HALF_UP).doubleValue()));
+    }
+}

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

@@ -1,44 +0,0 @@
-package com.njcn.harmonic.service.impl;
-
-import com.njcn.harmonic.pojo.vo.ReportValue;
-
-import java.util.List;
-
-public class RegroupData {
-    public static void regroupData(List<ReportValue> list, boolean... b) {
-        if (1 == b.length || (2 == b.length && b[1] == false)) {
-            if (0 < list.size()) {
-                return;
-            }
-        }
-
-        Float value = null;
-        int length = b[0] ? 3 : 1;
-
-        length = (b.length == 2 && !b[1]) ? 4 : length;
-
-        for (int i = 0; i < length; i++) {
-            String str = null;
-
-            if (b[0]) {
-                switch (i) {
-                    case 0:
-                        str = "A";
-                        break;
-                    case 1:
-                        str = "B";
-                        break;
-                    case 2:
-                        str = "C";
-                        break;
-                    case 3:
-                        str = "T";
-                        break;
-                }
-            }
-
-            ReportValue reportValue = new ReportValue(str, value, value, value, value);
-            list.add(reportValue);
-        }
-    }
-}

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

@@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.harmonic.mapper.RStatDataHarmRateVDMapper;
-import com.njcn.harmonic.mapper.RStatDataIDMapper;
-import com.njcn.harmonic.mapper.RStatDataInharmVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataHarmRateVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataIDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataInharmVDMapper;
 import com.njcn.harmonic.mapper.ReportMapper;
 import com.njcn.harmonic.pojo.po.RStatDataVD;
 import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
@@ -15,6 +15,7 @@ import com.njcn.harmonic.pojo.param.ReportQueryParam;
 import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
 import com.njcn.harmonic.pojo.po.report.OverLimitInfo;
 import com.njcn.harmonic.pojo.vo.ReportValue;
+import com.njcn.harmonic.common.service.impl.RegroupDataComm;
 import com.njcn.harmonic.service.IRStatDataVDService;
 import com.njcn.harmonic.service.ReportService;
 import lombok.RequiredArgsConstructor;
@@ -74,9 +75,9 @@ public class ReportServiceImpl implements ReportService {
         //获取线电压有效值
         List<ReportValue> listVV = reportMapper.getVVirtualData(param);
 
-        RegroupData.regroupData(listV, true);
-        RegroupData.regroupData(listI, true);
-        RegroupData.regroupData(listVV, true);
+        RegroupDataComm.regroupData(listV, true);
+        RegroupDataComm.regroupData(listI, true);
+        RegroupDataComm.regroupData(listVV, true);
         list.addAll(listV);
         list.addAll(listI);
         list.addAll(listVV);
@@ -96,10 +97,10 @@ public class ReportServiceImpl implements ReportService {
         //获取功率因数
         List<ReportValue> listF = reportMapper.getPF(param);
 
-        RegroupData.regroupData(listP, true, false);
-        RegroupData.regroupData(listQ, true, false);
-        RegroupData.regroupData(listS, true, false);
-        RegroupData.regroupData(listF, true, false);
+        RegroupDataComm.regroupData(listP, true, false);
+        RegroupDataComm.regroupData(listQ, true, false);
+        RegroupDataComm.regroupData(listS, true, false);
+        RegroupDataComm.regroupData(listF, true, false);
         list.addAll(listP);
         list.addAll(listQ);
         list.addAll(listS);
@@ -116,8 +117,8 @@ public class ReportServiceImpl implements ReportService {
         //长时闪变
         List<ReportValue> listLFlicker = reportMapper.getLFlickerData(param);
 
-        RegroupData.regroupData(listFlicker, true);
-        RegroupData.regroupData(listLFlicker, true);
+        RegroupDataComm.regroupData(listFlicker, true);
+        RegroupDataComm.regroupData(listLFlicker, true);
         list.addAll(listFlicker);
         list.addAll(listLFlicker);
 
@@ -132,8 +133,8 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> listU = reportMapper.getUVdeviationData(param);
         List<ReportValue> listL = reportMapper.getLVdeviationData(param);
 
-        RegroupData.regroupData(listU, true);
-        RegroupData.regroupData(listL, true);
+        RegroupDataComm.regroupData(listU, true);
+        RegroupDataComm.regroupData(listL, true);
         list.addAll(listU);
         list.addAll(listL);
         return list;
@@ -148,8 +149,8 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> listI = reportMapper.getDistortionDataI(param);
 
         //添加之前判断数据库是否有数据，如果没有数据模拟数据添加到集合中
-        RegroupData.regroupData(listU, true);
-        RegroupData.regroupData(listI, true);
+        RegroupDataComm.regroupData(listU, true);
+        RegroupDataComm.regroupData(listI, true);
         list.addAll(listU);
         list.addAll(listI);
 
@@ -164,8 +165,8 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> listFreDEV = reportMapper.getDEVFrequencyData(param);
 
 
-        RegroupData.regroupData(listFre, true);
-        RegroupData.regroupData(listFreDEV, true);
+        RegroupDataComm.regroupData(listFre, true);
+        RegroupDataComm.regroupData(listFreDEV, true);
         list.addAll(listFre);
         list.addAll(listFreDEV);
         return list;
@@ -201,7 +202,7 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> listI = dataI(param, Arrays.asList("A", "B", "C"), 1, 51, false, 0);
         if (CollUtil.isEmpty(listI)) {
             for (int i = 0; i < 50; i++) {
-                RegroupData.regroupData(list, true, true);
+                RegroupDataComm.regroupData(list, true, true);
             }
         } else {
             list.addAll(listI);
@@ -217,7 +218,7 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> listV = dataV(param, Arrays.asList("A", "B", "C"), 1, 2, false, 5);
 
         if (CollUtil.isEmpty(listV)) {
-            RegroupData.regroupData(list, true, true);
+            RegroupDataComm.regroupData(list, true, true);
         } else {
             list.addAll(listV);
         }
@@ -227,7 +228,7 @@ public class ReportServiceImpl implements ReportService {
 
         if (CollUtil.isEmpty(listRate)) {
             for (int i = 0; i < 49; i++) {
-                RegroupData.regroupData(list, true, true);
+                RegroupDataComm.regroupData(list, true, true);
             }
         } else {
             list.addAll(listRate);
@@ -235,7 +236,7 @@ public class ReportServiceImpl implements ReportService {
 
         //获取电压畸变率
         List<ReportValue> listU = reportMapper.getDistortionDataV(param);
-        RegroupData.regroupData(listU, true);
+        RegroupDataComm.regroupData(listU, true);
         list.addAll(listU);
         return list;
     }
@@ -290,7 +291,7 @@ public class ReportServiceImpl implements ReportService {
         });
         if (CollUtil.isEmpty(a)) {
             for (int i = 1; i < 17; i++) {
-                RegroupData.regroupData(a, true, true);
+                RegroupDataComm.regroupData(a, true, true);
             }
         }
         return a;
@@ -301,7 +302,7 @@ public class ReportServiceImpl implements ReportService {
         List<ReportValue> list = new ArrayList<>();
         //负序电流
         List<ReportValue> iNegData = reportMapper.getINegData(param);
-        RegroupData.regroupData(iNegData, true);
+        RegroupDataComm.regroupData(iNegData, true);
         list.addAll(iNegData);
         return list;
     }
@@ -310,7 +311,7 @@ public class ReportServiceImpl implements ReportService {
     private void regroupData(List<ReportValue> list) {
         for (int i = 0; i < 4; i++) {
             List<ReportValue> list1 = new ArrayList<>();
-            RegroupData.regroupData(list1, false);
+            RegroupDataComm.regroupData(list1, false);
             list.addAll(list1);
         }
     }

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

@@ -20,8 +20,7 @@ import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.vo.MonitorOverLimitVO;
 import com.njcn.harmonic.pojo.vo.SteadyExceedRateCensusVO;
 import com.njcn.harmonic.pojo.vo.SteadyExceedRateVO;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
-import com.njcn.harmonic.rstatlimitrate.service.IRStatLimitRateDService;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.SteadyExceedRateService;
 import com.njcn.harmonic.utils.PubUtils;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
@@ -53,7 +52,6 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
 
     private final GeneralDeviceInfoClient generalDeviceInfoClient;
     private final SteadyExceedRateMapper steadyExceedRateMapper;
-    private final IRStatLimitRateDService rateDService;
     private final RStatLimitRateDMapper rateDMapper;
     private final UserLedgerFeignClient userLedgerFeignClient;
 
@@ -531,7 +529,7 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
      */
     private List<LimitRatePO> getQualifiesRate(List<String> lineIndexes, String startTime, String endTime) {
         List<LimitRatePO> limitRatePOS = new ArrayList<>();
-        List<RStatLimitRateDPO> limitRates = rateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+        List<RStatLimitRateDPO> limitRates = rateDMapper.selectList(new LambdaQueryWrapper<RStatLimitRateDPO>()
                 .in(RStatLimitRateDPO::getLineId, lineIndexes)
                 .eq(RStatLimitRateDPO::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T)
                 .ge(StrUtil.isNotBlank(startTime), RStatLimitRateDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(startTime)))

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

@@ -13,12 +13,12 @@ import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.LineDetailVO;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.mapper.SteadyQualifyMapper;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.vo.SteadyQualifyCensusVO;
 import com.njcn.harmonic.pojo.vo.SteadyQualifyDetailVO;
 import com.njcn.harmonic.pojo.vo.SteadyQualifyVO;
-import com.njcn.harmonic.rstatlimitrate.service.IRStatLimitRateDService;
 import com.njcn.harmonic.service.SteadyQualifyService;
 import com.njcn.harmonic.utils.PubUtils;
 import com.njcn.supervision.api.UserLedgerFeignClient;
@@ -45,7 +45,7 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
 
     private final SteadyQualifyMapper steadyQualifyMapper;
 
-    private final IRStatLimitRateDService rateDService;
+    private final RStatLimitRateDMapper rStatLimitRateDMapper;
 
     private final UserLedgerFeignClient userLedgerFeignClient;
 
@@ -543,7 +543,7 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
      * @param endTime
      */
     private List<RStatLimitRateDPO> getQualifiesRate(List<String> lineIndexes, String startTime, String endTime) {
-        return rateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+        return rStatLimitRateDMapper.selectList(new LambdaQueryWrapper<RStatLimitRateDPO>()
                 .in(RStatLimitRateDPO::getLineId, lineIndexes)
                 .eq(RStatLimitRateDPO::getPhasicType, "T")
                 .ge(StrUtil.isNotBlank(startTime), RStatLimitRateDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(startTime)))

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

@@ -1,9 +1,6 @@
 package com.njcn.harmonic.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
@@ -16,7 +13,7 @@ import com.njcn.harmonic.pojo.param.RMpPartHarmonicDetailQueryParam;
 import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
-import com.njcn.harmonic.rstatlimitrate.service.IRStatLimitRateDService;
+import com.njcn.harmonic.service.IRStatLimitRateDService;
 import com.njcn.harmonic.service.majornetwork.RMpPartHarmonicDetailDService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;

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

@@ -33,7 +33,7 @@ import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 import com.njcn.harmonic.pojo.vo.MonitorLimitRateVO;
 import com.njcn.harmonic.pojo.vo.PwLimitDataVO;
 import com.njcn.harmonic.pojo.vo.RStatLimitTargetVO;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.IRStatLimitTargetDService;
 import com.njcn.harmonic.service.majornetwork.RStatLimitService;
 import com.njcn.system.pojo.enums.StatisticsEnum;

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

@@ -3,7 +3,7 @@ package com.njcn.harmonic.service.report;
 import com.njcn.harmonic.pojo.param.ReportSearchParam;
 import com.njcn.harmonic.pojo.param.ReportTemplateParam;
 import com.njcn.harmonic.pojo.po.ExcelRptTemp;
-import com.njcn.harmonic.pojo.vo.ReportTemplateVO;
+import com.njcn.harmonic.common.pojo.vo.ReportTemplateVO;
 import com.njcn.harmonic.pojo.vo.ReportTreeVO;
 import com.njcn.harmonic.pojo.vo.SysDeptTempVO;
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/CustomReportServiceImpl.java

@@ -23,7 +23,7 @@ import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import com.njcn.harmonic.enums.HarmonicResponseEnum;
 import com.njcn.harmonic.mapper.DeptTempMapper;
 import com.njcn.harmonic.mapper.EleEpdMapper;
-import com.njcn.harmonic.mapper.ExcelRptTempMapper;
+import com.njcn.harmonic.common.mapper.ExcelRptTempMapper;
 import com.njcn.harmonic.pojo.dto.ReportTemplateDTO;
 import com.njcn.harmonic.pojo.param.ReportSearchParam;
 import com.njcn.harmonic.pojo.param.ReportTemplateParam;
@@ -39,7 +39,7 @@ import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.harmonic.pojo.po.ExcelRptTemp;
 import com.njcn.harmonic.pojo.po.SysDeptTemp;
-import com.njcn.harmonic.pojo.vo.ReportTemplateVO;
+import com.njcn.harmonic.common.pojo.vo.ReportTemplateVO;
 import com.njcn.harmonic.pojo.vo.ReportTreeVO;
 import com.njcn.harmonic.pojo.vo.SysDeptTempVO;
 import com.njcn.harmonic.service.report.CustomReportService;
@@ -101,7 +101,7 @@ public class CustomReportServiceImpl implements CustomReportService {
     private final WlRecordFeignClient wlRecordFeignClient;
 
     private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
-    
+
     private final String CELL_DATA = "celldata";
     private final String V = "v";
     private final String STR_ONE = "#";
@@ -1167,6 +1167,115 @@ public class CustomReportServiceImpl implements CustomReportService {
     }
 
 
+
+
+    /**
+     * 对多测点数据进行计算求出一组数据
+     * @param method
+     * @param allList
+     * @return
+     */
+    private Map<String, Object> dealResultMap(String method, List<Map<String, Object>> allList) {
+        Map<String, Object> resultMap = new HashMap<>();
+        // 遍历列表中的每个Map
+        if (method.equals(InfluxDbSqlConstant.MIN)) {
+            for (Map<String, Object> map : allList) {
+                // 遍历当前Map的键值对
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    String key = entry.getKey();
+                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
+                        double value = (double) entry.getValue();
+                        // 检查结果Map中是否已包含该键
+                        if (!resultMap.containsKey(key) || (double) resultMap.get(key) > value) {
+                            // 如果不包含，或当前值更大，则更新结果Map
+                            resultMap.put(key, value);
+                        }
+                    }
+                }
+            }
+        } else if (method.equals(InfluxDbSqlConstant.MAX) || method.equals(InfluxDbSqlConstant.PERCENTILE)) {
+            for (Map<String, Object> map : allList) {
+                // 遍历当前Map的键值对
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    String key = entry.getKey();
+                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
+                        double value = (double) entry.getValue();
+                        // 检查结果Map中是否已包含该键
+                        if (!resultMap.containsKey(key) || (double) resultMap.get(key) < value) {
+                            // 如果不包含，或当前值更大，则更新结果Map
+                            resultMap.put(key, value);
+                        }
+                    }
+                }
+            }
+        } else if (method.equals(InfluxDbSqlConstant.AVG)) {
+            Map<String, Double> sumMap = new HashMap<>();
+            Map<String, Integer> countMap = new HashMap<>();
+            // 遍历列表中的每个Map
+            for (Map<String, Object> map : allList) {
+                // 遍历当前Map的键值对
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    String key = entry.getKey();
+                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
+                        double value = (double) entry.getValue();
+
+                        // 更新累计和
+                        sumMap.put(key, sumMap.getOrDefault(key, 0.0) + value);
+                        // 更新计数
+                        countMap.put(key, countMap.getOrDefault(key, 0) + 1);
+                    }
+                }
+            }
+
+            // 计算平均值并存储到结果Map中
+            for (String key : sumMap.keySet()) {
+                double sum = sumMap.get(key);
+                int count = countMap.get(key);
+                double average = BigDecimal.valueOf(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue();
+                resultMap.put(key, average);
+            }
+        }
+
+        return resultMap;
+    }
+
+
+
+    /**
+     * 处理指标超标结论
+     */
+    private void dealTargetResult
+    (Map<String, ReportTemplateDTO> assNoPassMap, Map<String, ReportTemplateDTO> limitTargetMapX, List<ReportTemplateDTO> endList) {
+        assNoPassMap.forEach((key, val) -> {
+            limitTargetMapX.remove(key);
+            if ("Freq_Dev".toUpperCase().equals(val.getTemplateName())) {
+                val.setValue("±" + val.getValue());
+            }
+
+            String expend = "";
+            if(Objects.nonNull(val.getLowValue())){
+                expend = val.getLowValue()+",";
+            }
+            if (val.getOverLimitFlag() == 1) {
+                val.setValue("不合格 (" + expend+val.getValue() + ")");
+            } else {
+                val.setValue("合格 (" + expend+val.getValue() + ")");
+            }
+            endList.add(val);
+        });
+
+        limitTargetMapX.forEach((key, val) -> {
+            if (Objects.isNull(val.getOverLimitFlag())) {
+                val.setValue("/");
+            } else {
+                val.setValue("合格");
+            }
+            endList.add(val);
+        });
+    }
+
+
+
     private void analyzeReportZhejiang(ReportSearchParam reportSearchParam, ExcelRptTemp excelRptTemp, HttpServletResponse response) {
         //指标
         List<ReportTemplateDTO> reportTemplateDTOList = new ArrayList<>();
@@ -1438,178 +1547,6 @@ public class CustomReportServiceImpl implements CustomReportService {
         endList.addAll(data);
     }
 
-
-    /**
-     * 对多测点数据进行计算求出一组数据
-     * @param method
-     * @param allList
-     * @return
-     */
-    private Map<String, Object> dealResultMap(String method, List<Map<String, Object>> allList) {
-        Map<String, Object> resultMap = new HashMap<>();
-        // 遍历列表中的每个Map
-        if (method.equals(InfluxDbSqlConstant.MIN)) {
-            for (Map<String, Object> map : allList) {
-                // 遍历当前Map的键值对
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    String key = entry.getKey();
-                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
-                        double value = (double) entry.getValue();
-                        // 检查结果Map中是否已包含该键
-                        if (!resultMap.containsKey(key) || (double) resultMap.get(key) > value) {
-                            // 如果不包含，或当前值更大，则更新结果Map
-                            resultMap.put(key, value);
-                        }
-                    }
-                }
-            }
-        } else if (method.equals(InfluxDbSqlConstant.MAX) || method.equals(InfluxDbSqlConstant.PERCENTILE)) {
-            for (Map<String, Object> map : allList) {
-                // 遍历当前Map的键值对
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    String key = entry.getKey();
-                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
-                        double value = (double) entry.getValue();
-                        // 检查结果Map中是否已包含该键
-                        if (!resultMap.containsKey(key) || (double) resultMap.get(key) < value) {
-                            // 如果不包含，或当前值更大，则更新结果Map
-                            resultMap.put(key, value);
-                        }
-                    }
-                }
-            }
-        } else if (method.equals(InfluxDbSqlConstant.AVG)) {
-            Map<String, Double> sumMap = new HashMap<>();
-            Map<String, Integer> countMap = new HashMap<>();
-            // 遍历列表中的每个Map
-            for (Map<String, Object> map : allList) {
-                // 遍历当前Map的键值对
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    String key = entry.getKey();
-                    if (Objects.nonNull(entry.getValue()) && !key.equals("time")) {
-                        double value = (double) entry.getValue();
-
-                        // 更新累计和
-                        sumMap.put(key, sumMap.getOrDefault(key, 0.0) + value);
-                        // 更新计数
-                        countMap.put(key, countMap.getOrDefault(key, 0) + 1);
-                    }
-                }
-            }
-
-            // 计算平均值并存储到结果Map中
-            for (String key : sumMap.keySet()) {
-                double sum = sumMap.get(key);
-                int count = countMap.get(key);
-                double average = BigDecimal.valueOf(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue();
-                resultMap.put(key, average);
-            }
-        }
-
-        return resultMap;
-    }
-
-
-    private void dealExcelResult(JSONArray
-                                         jsonArray, Map<String, List<ReportTemplateDTO>> assMap, Map<String, String> unit,Map<String,String> finalTerminalMap) {
-        jsonArray.forEach(item -> {
-            JSONObject jsonObject = (JSONObject) item;
-            JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
-            itemArr.forEach((it) -> {
-                if (Objects.nonNull(it) && !"null".equals(it.toString())) {
-                    //获取到1列
-                    JSONObject data = (JSONObject) it;
-                    JSONObject son = (JSONObject) data.get(V);
-                    if (son.containsKey(V)) {
-                        String v = son.getStr(V);
-                        //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
-                        if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
-                            String str = "";
-                            List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_TWO, ""));
-                            if (Objects.nonNull(rDto)) {
-                                str = rDto.get(0).getValue();
-                                //没有值，赋"/"
-                                if (StringUtils.isBlank(str)) {
-                                    str = "/";
-                                }
-                                son.set(V, str);
-                                if (Objects.nonNull(rDto.get(0).getOverLimitFlag()) && rDto.get(0).getOverLimitFlag() == 1) {
-                                    son.set("fc", "#990000");
-                                }
-                            }
-                        } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                            //指标合格情况
-                            String str = "";
-                            List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, ""));
-                            if (Objects.nonNull(rDto)) {
-                                str = rDto.get(0).getValue();
-                                //没有值，赋"/"
-                                if (StringUtils.isBlank(str)) {
-                                    str = "/";
-                                }
-                                son.set(V, str);
-                                if ("不合格".equals(str)) {
-                                    son.set("fc", "#990000");
-                                }
-                            }
-                        } else if (v.charAt(0) == '&') {
-                            //结论
-                            String tem = v.replace(STR_THREE, "");
-                            if (Objects.nonNull(finalTerminalMap)) {
-                                if ("statis_time".equals(tem)) {
-                                   // son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + InfluxDbSqlConstant.END_TIME);
-                                } else {
-                                    //台账信息
-                                    son.set(V, finalTerminalMap.getOrDefault(tem, "/"));
-                                }
-                            }
-                        } else if (v.charAt(0) == '@' && v.contains(STR_ONE)) {
-                            //解决数据单位问题 @指标#类型@
-                            String replace = v.replace("@", "");
-                            son.set(V, unit.getOrDefault(replace, "/"));
-
-                        }
-                    }
-                }
-            });
-        });
-    }
-
-
-    /**
-     * 处理指标超标结论
-     */
-    private void dealTargetResult
-    (Map<String, ReportTemplateDTO> assNoPassMap, Map<String, ReportTemplateDTO> limitTargetMapX, List<ReportTemplateDTO> endList) {
-        assNoPassMap.forEach((key, val) -> {
-            limitTargetMapX.remove(key);
-            if ("Freq_Dev".toUpperCase().equals(val.getTemplateName())) {
-                val.setValue("±" + val.getValue());
-            }
-
-            String expend = "";
-            if(Objects.nonNull(val.getLowValue())){
-                expend = val.getLowValue()+",";
-            }
-            if (val.getOverLimitFlag() == 1) {
-                val.setValue("不合格 (" + expend+val.getValue() + ")");
-            } else {
-                val.setValue("合格 (" + expend+val.getValue() + ")");
-            }
-            endList.add(val);
-        });
-
-        limitTargetMapX.forEach((key, val) -> {
-            if (Objects.isNull(val.getOverLimitFlag())) {
-                val.setValue("/");
-            } else {
-                val.setValue("合格");
-            }
-            endList.add(val);
-        });
-    }
-
-
     /**
      * 解析模板
      *
@@ -1689,6 +1626,74 @@ public class CustomReportServiceImpl implements CustomReportService {
         }
     }
 
+
+    private void dealExcelResult(JSONArray
+                                         jsonArray, Map<String, List<ReportTemplateDTO>> assMap, Map<String, String> unit,Map<String,String> finalTerminalMap) {
+        jsonArray.forEach(item -> {
+            JSONObject jsonObject = (JSONObject) item;
+            JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
+            itemArr.forEach((it) -> {
+                if (Objects.nonNull(it) && !"null".equals(it.toString())) {
+                    //获取到1列
+                    JSONObject data = (JSONObject) it;
+                    JSONObject son = (JSONObject) data.get(V);
+                    if (son.containsKey(V)) {
+                        String v = son.getStr(V);
+                        //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
+                        if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
+                            String str = "";
+                            List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_TWO, ""));
+                            if (Objects.nonNull(rDto)) {
+                                str = rDto.get(0).getValue();
+                                //没有值，赋"/"
+                                if (StringUtils.isBlank(str)) {
+                                    str = "/";
+                                }
+                                son.set(V, str);
+                                if (Objects.nonNull(rDto.get(0).getOverLimitFlag()) && rDto.get(0).getOverLimitFlag() == 1) {
+                                    son.set("fc", "#990000");
+                                }
+                            }
+                        } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
+                            //指标合格情况
+                            String str = "";
+                            List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, ""));
+                            if (Objects.nonNull(rDto)) {
+                                str = rDto.get(0).getValue();
+                                //没有值，赋"/"
+                                if (StringUtils.isBlank(str)) {
+                                    str = "/";
+                                }
+                                son.set(V, str);
+                                if ("不合格".equals(str)) {
+                                    son.set("fc", "#990000");
+                                }
+                            }
+                        } else if (v.charAt(0) == '&') {
+                            //结论
+                            String tem = v.replace(STR_THREE, "");
+                            if (Objects.nonNull(finalTerminalMap)) {
+                                if ("statis_time".equals(tem)) {
+                                    // son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + InfluxDbSqlConstant.END_TIME);
+                                } else {
+                                    //台账信息
+                                    son.set(V, finalTerminalMap.getOrDefault(tem, "/"));
+                                }
+                            }
+                        } else if (v.charAt(0) == '@' && v.contains(STR_ONE)) {
+                            //解决数据单位问题 @指标#类型@
+                            String replace = v.replace("@", "");
+                            son.set(V, unit.getOrDefault(replace, "/"));
+
+                        }
+                    }
+                }
+            });
+        });
+    }
+
+
+
     public static boolean isInteger(String str) {
         try {
             Integer.parseInt(str);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java

@@ -13,17 +13,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.LineIntegrityDataClient;
 import com.njcn.device.pms.api.MonitorClient;
-import com.njcn.device.pms.api.PmsMidLedgerClient;
 import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pq.pojo.po.RStatIntegrityD;
-import com.njcn.harmonic.mapper.RStatDataVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataVDMapper;
 import com.njcn.harmonic.mapper.upload.*;
 import com.njcn.harmonic.pojo.dto.upload.PqEvaluationCreateDTO;
 import com.njcn.harmonic.pojo.dto.upload.RDimUpDTO;
@@ -35,7 +33,7 @@ import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.po.upload.*;
 import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO;
 import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
-import com.njcn.harmonic.rstatlimitrate.mapper.RStatLimitRateDMapper;
+import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.upload.IEvaluationDataService;
 import com.njcn.harmonic.service.upload.IRUploadDataLogService;
 import com.njcn.system.api.DicDataFeignClient;