代码调整

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

@@ -0,0 +1,51 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.service.DataExceptionService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author qijian
+ * @date 2022/10/26
+ * 数据是否异常
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/dataException")
+@Api(tags = "数据是否异常")
+@AllArgsConstructor
+public class DataExceptionController extends BaseController {
+
+    private final DataExceptionService dataExceptionService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/lineDataException")
+    @ApiOperation("监测点数据是否异常")
+    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
+    public HttpResult<Boolean> lineDataException(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
+        String methodDescribe = getMethodDescribe("lineDataException");
+        boolean res = dataExceptionService.lineDataException(algorithmSearchParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.service.DataIntegrityRateService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author qijian
+ * @date 2022/10/26
+ * 数据完整率算法
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/dataIntegrityRate")
+@Api(tags = "数据完整率算法")
+@AllArgsConstructor
+public class DataIntegrityRateController extends BaseController {
+
+    private final DataIntegrityRateService dataIntegrityRateService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/lineDataIntegrityRate")
+    @ApiOperation("监测点日数据完整率")
+    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
+    public HttpResult<Boolean> lineDataIntegrityRate(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
+        String methodDescribe = getMethodDescribe("lineDataIntegrityRate");
+        boolean res = dataIntegrityRateService.lineDataIntegrityRate(algorithmSearchParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+import com.njcn.harmonic.service.RMpBenchmarkLevelMService;
+import com.njcn.harmonic.service.RMpBenchmarkLevelQService;
+import com.njcn.harmonic.service.RMpBenchmarkLevelYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RMpBenchmarkLevelController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-11 10:34
+ * @Version V1.0
+ */
+@RestController
+@Api(tags = "主网-区域稳态电能质量水平评估")
+@RequiredArgsConstructor
+@RequestMapping("/rMpBenchmarkLevel")
+public class RMpBenchmarkLevelController extends BaseController {
+
+    private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月
+
+    private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季
+
+    private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年
+
+
+    @PostMapping("getAllRMpBenchmarkLevelList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询区域稳态电能质量水平评估")
+    public HttpResult<List<RMpBenchmarkLevelVO>> getAllRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        String methodDescribe = getMethodDescribe("getAllRMpBenchmarkLevelList");
+        //获取查询条件-时间类型
+        String type = rMpBenchmarkLevelParam.getType().toString();
+        List<RMpBenchmarkLevelVO> rMpBenchmarkLevelList;
+        switch (type) {
+            case BizParamConstant.STAT_BIZ_YEAR:
+                //查询基准水平-年数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelYService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                //查询基准水平-季数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_MONTH:
+                //查询基准水平-月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            default:
+                //如果前端没有传type默认查询月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam;
+import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO;
+import com.njcn.harmonic.service.RMpHarmonicReportDService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RMpHarmonicReportDController
+ * @Package com.njcn.harmonic.controller
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:08
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/rMpHarmonicReportD")
+@Api(tags = "主网-监测点稳态指标日报")
+@RequiredArgsConstructor
+public class RMpHarmonicReportDController extends BaseController {
+
+    private final RMpHarmonicReportDService rMpHarmonicReportDService;
+
+    @PostMapping("getMonitorStatisticsD")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询监测点日统计信息")
+    public HttpResult<List<RMpHarmonicReportDVO>> getMonitorStatisticsD(@RequestBody RMpHarmonicReportDParam rMpHarmonicReportDParam) {
+        String methodDescribe = getMethodDescribe("getMonitorStatisticsD");
+        List<RMpHarmonicReportDVO> list = rMpHarmonicReportDService.getMonitorStatisticsD(rMpHarmonicReportDParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-监测点分类总览")
+@RequestMapping("/harmonic/rStatHarmonic")
+public class RStatHarmonicMController extends BaseController {
+
+    private final RStatHarmonicMService rStatHarmonicMService;
+    private final RStatHarmonicQService rStatHarmonicQService;
+    private final RStatHarmonicYService rStatHarmonicYService;
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonic")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonicM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonic");
+        List<RArrayVO> rStatHarmonicMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicMAll = rStatHarmonicYService.getRStatHarmonicYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicMAll = rStatHarmonicQService.getRStatHarmonicQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicMAll = rStatHarmonicMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
+    }
+
+    /**
+     * 电铁-频率偏差-电压统计图
+     */
+    @GetMapping("/getRStatHarmonicIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态电铁-频率偏差-电压统计图")
+    public HttpResult<List<RIconVO>> getRStatHarmonicIcon(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage");
+        List<RIconVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+    /**
+     * 电铁-频率偏差-电压统计图
+     */
+    @GetMapping("/getRStatHarmonicIconDate")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态电铁-频率偏差-越线日期统计图")
+    public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIcon2(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
+        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+
+}
+

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

@@ -0,0 +1,104 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-各单位分类总览")
+@RequestMapping("/harmonic/rStatHarmonicOrg")
+public class RStatHarmonicOrgMController extends BaseController {
+
+    private final RStatHarmonicOrgYService rStatHarmonicOrgYService;
+    private final RStatHarmonicOrgQService rStatHarmonicOrgQService;
+    private final RStatHarmonicOrgMService rStatHarmonicOrgMService;
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonicOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
+        List<RArrayVO> rStatHarmonicOrgMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getRStatHarmonicYAll(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgQService.getRStatHarmonicQAll(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
+    }
+
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonicOrgIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态各单位超标监测统计图")
+    public HttpResult<List<RIconVO>> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrgIcon");
+        List<RIconVO> getAllRStatHarmonicOrgIcon = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数统计图-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getRStatHarmonicOrgYIcon(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgQService.getRStatHarmonicOrgQIcon(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgMService.getRStatHarmonicOrgMIcon(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, getAllRStatHarmonicOrgIcon, methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,188 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 区域分类统计月表 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标-稳态指标")
+@RequestMapping("/harmonic/rStatOrg")
+public class RStatOrgController extends BaseController {
+
+    private final RStatOrgYService rStatOrgYService;
+    private final RStatOrgQService rStatOrgQService;
+    private final RStatOrgMService rStatOrgMService;
+    private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService;
+    private final RStatLoadTypeService rStatLoadTypeService;
+    private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService;
+    private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService;
+    private final RMpPassRateService rMpPassRateService;
+
+
+    /**
+     * 查询区域超标统计
+     */
+    @GetMapping("/getAllRStatHarmonicOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域超标统计")
+    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
+        List<RStatOrgVO> rStatHarmonicOrgMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询区域超标统计-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgMAll = rStatOrgYService.getRStatHarmonicYAll(param);
+                break;
+            //查询区域超标统计-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgMAll = rStatOrgQService.getRStatHarmonicQAll(param);
+                break;
+            //查询各区域超标统计-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgMAll = rStatOrgMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
+    }
+
+
+    /**
+     * 区域稳态指标超标分类统计表
+     */
+    @GetMapping("/getRStatSubstation")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域稳态指标超标分类统计表")
+    public HttpResult<List<RStatSubstationOrg2VO>> getAllRStatSubstation(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatSubstation");
+        List<RStatSubstationOrg2VO> statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标超标分类统计表
+     */
+//    @GetMapping("/getRStatOrgBusbarVoltage")
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @ApiOperation("区域电站母线电压类指标超标计")
+//    public HttpResult<List<RStatOrgBusbarVoltageVO>> getRStatOrgBusbarVoltage(StatisticsBizBaseParam param){
+//        String methodDescribe = getMethodDescribe("getRStatSubstation");
+//        List<RStatOrgBusbarVoltageVO> statSubstationIcon = rStatOrgBusbarVoltageService.getRStatOrgBusbarVoltage(param);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+//    }
+
+    /**
+     * 区域干扰源电流类指标超标统计
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRStatLoadType")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域干扰源电流类指标超标统计")
+    public HttpResult<List<RArrayVO>> getRStatLoadType(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatLoadType");
+        List<RArrayVO> rStatLoadType = rStatLoadTypeService.getRStatLoadType(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatLoadType, methodDescribe);
+    }
+
+    /**
+     * 变电站（换流站）稳态指标超标分类统计表
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRStatSubstationOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站（换流站）稳态指标超标分类统计表")
+    public HttpResult<List<RSubstationIcon2VO.RSubstationInfoVO>> getRStatSubstationOrg(@RequestBody StatSubstationBizBaseParam param
+             ){
+        String methodDescribe = getMethodDescribe("getRStatSubstationOrg");
+        List<RSubstationIcon2VO.RSubstationInfoVO> rStatOrg = rStatOrgYService.getRStatSubstation(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRMpPartHarmonicDetail")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表")
+    public HttpResult<List<RMpPartHarmonicDetailVO>> getRMpPartHarmonicDetail(@RequestBody RStatOrgParam param){
+        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetail");
+        List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailMService.getRMpPartHarmonicDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRMpPartHarmonicDetailIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表-指标趋势图")
+    public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
+        List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRStatOrgIndex")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域稳态指标合格率统计表")
+    public HttpResult<List<RStatOrgIndexVO.RStatOrgIndexInfoVO>> getRStatOrgIndex(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatOrgIndex");
+        List<RStatOrgIndexVO.RStatOrgIndexInfoVO> rStatOrg = rStatOrgYService.getRStatOrgIndex(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRMpPassRateInfo")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标合格率明细表")
+    public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param){
+        String methodDescribe = getMethodDescribe("getRMpPassRateInfo");
+        List<RStatOrgIndexVO> rStatOrg = rMpPassRateService.getRMpPassRateInfo(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,81 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+import com.njcn.harmonic.service.RStatSubstationMService;
+import com.njcn.harmonic.service.RStatSubstationVoltageMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-变电站分类总览")
+@RequestMapping("/harmonic/rStatSubstation")
+public class RStatSubstationMController extends BaseController {
+
+    private final RStatSubstationMService rStatSubstationMService;
+    private final RStatSubstationVoltageMService rStatSubstationVoltageMService;
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     */
+    @GetMapping("/getAllRStatSubstationIconDays")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标超标分布（按超标天数）")
+    public HttpResult<RSubstationIconVO> getAllRStatSubstation(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconDays");
+        RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+    /**
+     * 变电站稳态指标超标分布（按电压等级）
+     */
+    @GetMapping("/getAllRStatSubstationIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标超标分布（按电压等级）")
+    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIcon2(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconVoltage");
+        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+
+    /**
+     * 变电站稳态指标平均超标天数
+     */
+    @GetMapping("/getAllRStatSubstationIconAvgDays")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标平均超标天数")
+    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIcon3(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconAvgDays");
+        List<RSubstationIcon2VO> statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+}
+

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

@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.PmsAbnormalRules;
+
+/**
+ * PmsAbnormalRulesMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface PmsAbnormalRulesMapper extends BaseMapper<PmsAbnormalRules> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM
+*/
+public interface RMpBenchmarkLevelMMapper extends BaseMapper<RMpBenchmarkLevelM> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ
+*/
+public interface RMpBenchmarkLevelQMapper extends BaseMapper<RMpBenchmarkLevelQ> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY
+*/
+public interface RMpBenchmarkLevelYMapper extends BaseMapper<RMpBenchmarkLevelY> {
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Mapper
+* @createDate 2022-10-20 18:38:15
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD
+*/
+public interface RMpHarmonicIMagReportDMapper extends BaseMapper<RMpHarmonicIMagReportD> {
+
+    List<RMpHarmonicIMagReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Mapper
+* @createDate 2022-10-20 18:43:52
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD
+*/
+public interface RMpHarmonicIRateReportDMapper extends BaseMapper<RMpHarmonicIRateReportD> {
+
+    List<RMpHarmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_harmonic_v_rate_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 )】的数据库操作Mapper
+* @createDate 2022-10-20 18:34:05
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD
+*/
+public interface RMpHarmonicVRateReportDMapper extends BaseMapper<RMpHarmonicVRateReportD> {
+
+    List<RMpHarmonicVRateReportD> getListByCond(Map<String, Object> map);
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Mapper
+* @createDate 2022-10-20 18:45:58
+* @Entity com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD
+*/
+public interface RMpInharmonicIRateReportDMapper extends BaseMapper<RMpInharmonicIRateReportD> {
+
+    List<RMpInharmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 18:45:36
+* @Entity com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD
+*/
+public interface RMpInharmonicVRateReportDMapper extends BaseMapper<RMpInharmonicVRateReportD> {
+
+    List<RMpInharmonicVRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+

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

@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpIntegrityD;
+
+/**
+ * RMpIntegrityDMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface RMpIntegrityDMapper extends BaseMapper<RMpIntegrityD> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_phase_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 18:20:08
+* @Entity com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD
+*/
+public interface RMpMeasurePhaseReportDMapper extends BaseMapper<RMpMeasurePhaseReportD> {
+
+    List<RMpMeasurePhaseReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+

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

@@ -0,0 +1,19 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpMeasureReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_measure_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 16:32:37
+* @Entity com.njcn.harmonic.pojo.po.RMpMeasureReportD
+*/
+public interface RMpMeasureReportDMapper extends BaseMapper<RMpMeasureReportD> {
+
+
+    List<RMpMeasureReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailDMapper extends BaseMapper<RMpPartHarmonicDetailD> {
+
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(@Param("param") StatisticsBizBaseParam param);
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailMMapper extends BaseMapper<RMpPartHarmonicDetailM> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateMMapper extends BaseMapper<RMpPassRateM> {
+
+    /**
+     * 获取月稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getMonthPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateQMapper extends BaseMapper<RMpPassRateQ> {
+
+    /**
+     * 获取季稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getQuarterPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateYMapper extends BaseMapper<RMpPassRateY> {
+
+    /**
+     * 获取年稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getYearPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpSurplusHarmonicDetailDMapper extends BaseMapper<RMpSurplusHarmonicDetailD> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpSurplusHarmonicDetailMMapper extends BaseMapper<RMpSurplusHarmonicDetailM> {
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatAbnormalD;
+
+/**
+ * RStatAbnormalDMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface RStatAbnormalDMapper extends BaseMapper<RStatAbnormalD> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicD;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicDMapper extends BaseMapper<RStatHarmonicD> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+public interface RStatHarmonicMMapper extends BaseMapper<RStatHarmonicM> {
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicQMapper extends BaseMapper<RStatHarmonicQ> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+public interface RStatHarmonicVoltageDMapper extends BaseMapper<RStatHarmonicVoltageD> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+public interface RStatHarmonicVoltageMMapper extends BaseMapper<RStatHarmonicVoltageM> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicY;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicYMapper extends BaseMapper<RStatHarmonicY> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeMMapper extends BaseMapper<RStatLoadTypeM> {
+
+    /**
+     * 获取月区域暂态指标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatLoadTypeVO> getMonthStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeQMapper extends BaseMapper<RStatLoadTypeQ> {
+
+    /**
+     * 获取季区域暂态指标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatLoadTypeVO> getQuarterStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeYMapper extends BaseMapper<RStatLoadTypeY> {
+
+    /**
+     * 获取年区域暂态指标分类统计表
+     * @return
+     */
+    List<RStatLoadTypeVO> getYearStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageMMapper extends BaseMapper<RStatOrgBusbarVoltageM> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageQMapper extends BaseMapper<RStatOrgBusbarVoltageQ> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageYMapper extends BaseMapper<RStatOrgBusbarVoltageY> {
+
+}

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

@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计月表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
+
+    /**
+     * 区域稳态指标超标分类统计表--月表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                            ,@Param("dataType") String dataType);
+
+    /**
+     * 获取月区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                    ,@Param("dataType") String dataType);
+}

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

@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计季表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
+
+    /**
+     * 区域稳态指标超标分类统计表--年表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                                ,@Param("dataType") String dataType);
+
+    /**
+     * 获取季区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                            ,@Param("dataType") String dataType);
+}

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

@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计年表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
+
+    /**
+     * 区域稳态指标超标分类统计表--年表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                ,@Param("dataType") String dataType);
+
+    /**
+     *  获取年区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                ,@Param("dataType") String dataType);
+}

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

@@ -0,0 +1,35 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationMMapper extends BaseMapper<RStatSubstationM> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconM(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2M(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,35 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationQMapper extends BaseMapper<RStatSubstationQ> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconQ(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Q(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,30 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstationVoltageM> {
+
+    /**
+     * 变电站稳态指标超标分布（按电压等级）
+     * @param param
+     * @return
+     */
+    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param);
+
+}

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

@@ -0,0 +1,36 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationYMapper extends BaseMapper<RStatSubstationY> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconY(@Param("param") StatSubstationBizBaseParam param);
+
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Y(@Param("param") StatSubstationBizBaseParam param);
+}

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

@@ -0,0 +1,26 @@
+<?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.RMpBenchmarkLevelMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>

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

@@ -0,0 +1,26 @@
+<?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.RMpBenchmarkLevelQMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>

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

@@ -0,0 +1,26 @@
+<?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.RMpBenchmarkLevelYMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>

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

@@ -0,0 +1,303 @@
+<?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.RMpHarmonicIMagReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="fundamentalCurrentMax" column="fundamental_current_max" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrentMin" column="fundamental_current_min" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrentAvg" column="fundamental_current_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrent95" column="fundamental_current_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdMax" column="harmonic_current_thd_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdMin" column="harmonic_current_thd_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdAvg" column="harmonic_current_thd_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThd95" column="harmonic_current_thd_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Max" column="harmonic_current_effective_2_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Min" column="harmonic_current_effective_2_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Avg" column="harmonic_current_effective_2_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective295" column="harmonic_current_effective_2_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Max" column="harmonic_current_effective_3_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Min" column="harmonic_current_effective_3_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Avg" column="harmonic_current_effective_3_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective395" column="harmonic_current_effective_3_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Max" column="harmonic_current_effective_4_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Min" column="harmonic_current_effective_4_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Avg" column="harmonic_current_effective_4_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective495" column="harmonic_current_effective_4_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Max" column="harmonic_current_effective_5_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Min" column="harmonic_current_effective_5_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Avg" column="harmonic_current_effective_5_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective595" column="harmonic_current_effective_5_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Max" column="harmonic_current_effective_6_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Min" column="harmonic_current_effective_6_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Avg" column="harmonic_current_effective_6_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective695" column="harmonic_current_effective_6_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Max" column="harmonic_current_effective_7_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Min" column="harmonic_current_effective_7_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Avg" column="harmonic_current_effective_7_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective795" column="harmonic_current_effective_7_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Max" column="harmonic_current_effective_8_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Min" column="harmonic_current_effective_8_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Avg" column="harmonic_current_effective_8_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective895" column="harmonic_current_effective_8_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Max" column="harmonic_current_effective_9_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Min" column="harmonic_current_effective_9_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Avg" column="harmonic_current_effective_9_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective995" column="harmonic_current_effective_9_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Max" column="harmonic_current_effective_10_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Min" column="harmonic_current_effective_10_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Avg" column="harmonic_current_effective_10_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1095" column="harmonic_current_effective_10_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Max" column="harmonic_current_effective_11_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Min" column="harmonic_current_effective_11_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Avg" column="harmonic_current_effective_11_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1195" column="harmonic_current_effective_11_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Max" column="harmonic_current_effective_12_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Min" column="harmonic_current_effective_12_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Avg" column="harmonic_current_effective_12_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1295" column="harmonic_current_effective_12_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Max" column="harmonic_current_effective_13_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Min" column="harmonic_current_effective_13_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Avg" column="harmonic_current_effective_13_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1395" column="harmonic_current_effective_13_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Max" column="harmonic_current_effective_14_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Min" column="harmonic_current_effective_14_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Avg" column="harmonic_current_effective_14_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1495" column="harmonic_current_effective_14_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Max" column="harmonic_current_effective_15_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Min" column="harmonic_current_effective_15_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Avg" column="harmonic_current_effective_15_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1595" column="harmonic_current_effective_15_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Max" column="harmonic_current_effective_16_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Min" column="harmonic_current_effective_16_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Avg" column="harmonic_current_effective_16_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1695" column="harmonic_current_effective_16_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Max" column="harmonic_current_effective_17_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Min" column="harmonic_current_effective_17_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Avg" column="harmonic_current_effective_17_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1795" column="harmonic_current_effective_17_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Max" column="harmonic_current_effective_18_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Min" column="harmonic_current_effective_18_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Avg" column="harmonic_current_effective_18_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1895" column="harmonic_current_effective_18_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Max" column="harmonic_current_effective_19_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Min" column="harmonic_current_effective_19_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Avg" column="harmonic_current_effective_19_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1995" column="harmonic_current_effective_19_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Max" column="harmonic_current_effective_20_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Min" column="harmonic_current_effective_20_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Avg" column="harmonic_current_effective_20_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2095" column="harmonic_current_effective_20_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Max" column="harmonic_current_effective_21_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Min" column="harmonic_current_effective_21_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Avg" column="harmonic_current_effective_21_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2195" column="harmonic_current_effective_21_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Max" column="harmonic_current_effective_22_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Min" column="harmonic_current_effective_22_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Avg" column="harmonic_current_effective_22_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2295" column="harmonic_current_effective_22_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Max" column="harmonic_current_effective_23_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Min" column="harmonic_current_effective_23_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Avg" column="harmonic_current_effective_23_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2395" column="harmonic_current_effective_23_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Max" column="harmonic_current_effective_24_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Min" column="harmonic_current_effective_24_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Avg" column="harmonic_current_effective_24_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2495" column="harmonic_current_effective_24_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Max" column="harmonic_current_effective_25_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Min" column="harmonic_current_effective_25_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Avg" column="harmonic_current_effective_25_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2595" column="harmonic_current_effective_25_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Max" column="harmonic_current_effective_26_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Min" column="harmonic_current_effective_26_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Avg" column="harmonic_current_effective_26_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2695" column="harmonic_current_effective_26_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Max" column="harmonic_current_effective_27_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Min" column="harmonic_current_effective_27_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Avg" column="harmonic_current_effective_27_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2795" column="harmonic_current_effective_27_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Max" column="harmonic_current_effective_28_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Min" column="harmonic_current_effective_28_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Avg" column="harmonic_current_effective_28_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2895" column="harmonic_current_effective_28_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Max" column="harmonic_current_effective_29_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Min" column="harmonic_current_effective_29_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Avg" column="harmonic_current_effective_29_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2995" column="harmonic_current_effective_29_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Max" column="harmonic_current_effective_30_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Min" column="harmonic_current_effective_30_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Avg" column="harmonic_current_effective_30_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3095" column="harmonic_current_effective_30_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Max" column="harmonic_current_effective_31_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Min" column="harmonic_current_effective_31_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Avg" column="harmonic_current_effective_31_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3195" column="harmonic_current_effective_31_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Max" column="harmonic_current_effective_32_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Min" column="harmonic_current_effective_32_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Avg" column="harmonic_current_effective_32_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3295" column="harmonic_current_effective_32_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Max" column="harmonic_current_effective_33_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Min" column="harmonic_current_effective_33_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Avg" column="harmonic_current_effective_33_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3395" column="harmonic_current_effective_33_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Max" column="harmonic_current_effective_34_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Min" column="harmonic_current_effective_34_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Avg" column="harmonic_current_effective_34_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3495" column="harmonic_current_effective_34_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Max" column="harmonic_current_effective_35_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Min" column="harmonic_current_effective_35_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Avg" column="harmonic_current_effective_35_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3595" column="harmonic_current_effective_35_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Max" column="harmonic_current_effective_36_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Min" column="harmonic_current_effective_36_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Avg" column="harmonic_current_effective_36_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3695" column="harmonic_current_effective_36_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Max" column="harmonic_current_effective_37_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Min" column="harmonic_current_effective_37_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Avg" column="harmonic_current_effective_37_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3795" column="harmonic_current_effective_37_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Max" column="harmonic_current_effective_38_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Min" column="harmonic_current_effective_38_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Avg" column="harmonic_current_effective_38_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3895" column="harmonic_current_effective_38_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Max" column="harmonic_current_effective_39_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Min" column="harmonic_current_effective_39_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Avg" column="harmonic_current_effective_39_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3995" column="harmonic_current_effective_39_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Max" column="harmonic_current_effective_40_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Min" column="harmonic_current_effective_40_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Avg" column="harmonic_current_effective_40_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4095" column="harmonic_current_effective_40_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Max" column="harmonic_current_effective_41_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Min" column="harmonic_current_effective_41_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Avg" column="harmonic_current_effective_41_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4195" column="harmonic_current_effective_41_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Max" column="harmonic_current_effective_42_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Min" column="harmonic_current_effective_42_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Avg" column="harmonic_current_effective_42_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4295" column="harmonic_current_effective_42_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Max" column="harmonic_current_effective_43_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Min" column="harmonic_current_effective_43_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Avg" column="harmonic_current_effective_43_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4395" column="harmonic_current_effective_43_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Max" column="harmonic_current_effective_44_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Min" column="harmonic_current_effective_44_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Avg" column="harmonic_current_effective_44_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4495" column="harmonic_current_effective_44_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Max" column="harmonic_current_effective_45_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Min" column="harmonic_current_effective_45_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Avg" column="harmonic_current_effective_45_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4595" column="harmonic_current_effective_45_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Max" column="harmonic_current_effective_46_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Min" column="harmonic_current_effective_46_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Avg" column="harmonic_current_effective_46_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4695" column="harmonic_current_effective_46_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Max" column="harmonic_current_effective_47_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Min" column="harmonic_current_effective_47_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Avg" column="harmonic_current_effective_47_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4795" column="harmonic_current_effective_47_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Max" column="harmonic_current_effective_48_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Min" column="harmonic_current_effective_48_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Avg" column="harmonic_current_effective_48_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4895" column="harmonic_current_effective_48_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Max" column="harmonic_current_effective_49_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Min" column="harmonic_current_effective_49_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Avg" column="harmonic_current_effective_49_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4995" column="harmonic_current_effective_49_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Max" column="harmonic_current_effective_50_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Min" column="harmonic_current_effective_50_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Avg" column="harmonic_current_effective_50_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5095" column="harmonic_current_effective_50_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        fundamental_current_max,fundamental_current_min,fundamental_current_avg,
+        fundamental_current_95,harmonic_current_thd_max,harmonic_current_thd_min,
+        harmonic_current_thd_avg,harmonic_current_thd_95,harmonic_current_effective_2_max,
+        harmonic_current_effective_2_min,harmonic_current_effective_2_avg,harmonic_current_effective_2_95,
+        harmonic_current_effective_3_max,harmonic_current_effective_3_min,harmonic_current_effective_3_avg,
+        harmonic_current_effective_3_95,harmonic_current_effective_4_max,harmonic_current_effective_4_min,
+        harmonic_current_effective_4_avg,harmonic_current_effective_4_95,harmonic_current_effective_5_max,
+        harmonic_current_effective_5_min,harmonic_current_effective_5_avg,harmonic_current_effective_5_95,
+        harmonic_current_effective_6_max,harmonic_current_effective_6_min,harmonic_current_effective_6_avg,
+        harmonic_current_effective_6_95,harmonic_current_effective_7_max,harmonic_current_effective_7_min,
+        harmonic_current_effective_7_avg,harmonic_current_effective_7_95,harmonic_current_effective_8_max,
+        harmonic_current_effective_8_min,harmonic_current_effective_8_avg,harmonic_current_effective_8_95,
+        harmonic_current_effective_9_max,harmonic_current_effective_9_min,harmonic_current_effective_9_avg,
+        harmonic_current_effective_9_95,harmonic_current_effective_10_max,harmonic_current_effective_10_min,
+        harmonic_current_effective_10_avg,harmonic_current_effective_10_95,harmonic_current_effective_11_max,
+        harmonic_current_effective_11_min,harmonic_current_effective_11_avg,harmonic_current_effective_11_95,
+        harmonic_current_effective_12_max,harmonic_current_effective_12_min,harmonic_current_effective_12_avg,
+        harmonic_current_effective_12_95,harmonic_current_effective_13_max,harmonic_current_effective_13_min,
+        harmonic_current_effective_13_avg,harmonic_current_effective_13_95,harmonic_current_effective_14_max,
+        harmonic_current_effective_14_min,harmonic_current_effective_14_avg,harmonic_current_effective_14_95,
+        harmonic_current_effective_15_max,harmonic_current_effective_15_min,harmonic_current_effective_15_avg,
+        harmonic_current_effective_15_95,harmonic_current_effective_16_max,harmonic_current_effective_16_min,
+        harmonic_current_effective_16_avg,harmonic_current_effective_16_95,harmonic_current_effective_17_max,
+        harmonic_current_effective_17_min,harmonic_current_effective_17_avg,harmonic_current_effective_17_95,
+        harmonic_current_effective_18_max,harmonic_current_effective_18_min,harmonic_current_effective_18_avg,
+        harmonic_current_effective_18_95,harmonic_current_effective_19_max,harmonic_current_effective_19_min,
+        harmonic_current_effective_19_avg,harmonic_current_effective_19_95,harmonic_current_effective_20_max,
+        harmonic_current_effective_20_min,harmonic_current_effective_20_avg,harmonic_current_effective_20_95,
+        harmonic_current_effective_21_max,harmonic_current_effective_21_min,harmonic_current_effective_21_avg,
+        harmonic_current_effective_21_95,harmonic_current_effective_22_max,harmonic_current_effective_22_min,
+        harmonic_current_effective_22_avg,harmonic_current_effective_22_95,harmonic_current_effective_23_max,
+        harmonic_current_effective_23_min,harmonic_current_effective_23_avg,harmonic_current_effective_23_95,
+        harmonic_current_effective_24_max,harmonic_current_effective_24_min,harmonic_current_effective_24_avg,
+        harmonic_current_effective_24_95,harmonic_current_effective_25_max,harmonic_current_effective_25_min,
+        harmonic_current_effective_25_avg,harmonic_current_effective_25_95,harmonic_current_effective_26_max,
+        harmonic_current_effective_26_min,harmonic_current_effective_26_avg,harmonic_current_effective_26_95,
+        harmonic_current_effective_27_max,harmonic_current_effective_27_min,harmonic_current_effective_27_avg,
+        harmonic_current_effective_27_95,harmonic_current_effective_28_max,harmonic_current_effective_28_min,
+        harmonic_current_effective_28_avg,harmonic_current_effective_28_95,harmonic_current_effective_29_max,
+        harmonic_current_effective_29_min,harmonic_current_effective_29_avg,harmonic_current_effective_29_95,
+        harmonic_current_effective_30_max,harmonic_current_effective_30_min,harmonic_current_effective_30_avg,
+        harmonic_current_effective_30_95,harmonic_current_effective_31_max,harmonic_current_effective_31_min,
+        harmonic_current_effective_31_avg,harmonic_current_effective_31_95,harmonic_current_effective_32_max,
+        harmonic_current_effective_32_min,harmonic_current_effective_32_avg,harmonic_current_effective_32_95,
+        harmonic_current_effective_33_max,harmonic_current_effective_33_min,harmonic_current_effective_33_avg,
+        harmonic_current_effective_33_95,harmonic_current_effective_34_max,harmonic_current_effective_34_min,
+        harmonic_current_effective_34_avg,harmonic_current_effective_34_95,harmonic_current_effective_35_max,
+        harmonic_current_effective_35_min,harmonic_current_effective_35_avg,harmonic_current_effective_35_95,
+        harmonic_current_effective_36_max,harmonic_current_effective_36_min,harmonic_current_effective_36_avg,
+        harmonic_current_effective_36_95,harmonic_current_effective_37_max,harmonic_current_effective_37_min,
+        harmonic_current_effective_37_avg,harmonic_current_effective_37_95,harmonic_current_effective_38_max,
+        harmonic_current_effective_38_min,harmonic_current_effective_38_avg,harmonic_current_effective_38_95,
+        harmonic_current_effective_39_max,harmonic_current_effective_39_min,harmonic_current_effective_39_avg,
+        harmonic_current_effective_39_95,harmonic_current_effective_40_max,harmonic_current_effective_40_min,
+        harmonic_current_effective_40_avg,harmonic_current_effective_40_95,harmonic_current_effective_41_max,
+        harmonic_current_effective_41_min,harmonic_current_effective_41_avg,harmonic_current_effective_41_95,
+        harmonic_current_effective_42_max,harmonic_current_effective_42_min,harmonic_current_effective_42_avg,
+        harmonic_current_effective_42_95,harmonic_current_effective_43_max,harmonic_current_effective_43_min,
+        harmonic_current_effective_43_avg,harmonic_current_effective_43_95,harmonic_current_effective_44_max,
+        harmonic_current_effective_44_min,harmonic_current_effective_44_avg,harmonic_current_effective_44_95,
+        harmonic_current_effective_45_max,harmonic_current_effective_45_min,harmonic_current_effective_45_avg,
+        harmonic_current_effective_45_95,harmonic_current_effective_46_max,harmonic_current_effective_46_min,
+        harmonic_current_effective_46_avg,harmonic_current_effective_46_95,harmonic_current_effective_47_max,
+        harmonic_current_effective_47_min,harmonic_current_effective_47_avg,harmonic_current_effective_47_95,
+        harmonic_current_effective_48_max,harmonic_current_effective_48_min,harmonic_current_effective_48_avg,
+        harmonic_current_effective_48_95,harmonic_current_effective_49_max,harmonic_current_effective_49_min,
+        harmonic_current_effective_49_avg,harmonic_current_effective_49_95,harmonic_current_effective_50_max,
+        harmonic_current_effective_50_min,harmonic_current_effective_50_avg,harmonic_current_effective_50_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_i_mag_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,294 @@
+<?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.RMpHarmonicIRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="i2Max" column="i_2_max" jdbcType="FLOAT"/>
+            <result property="i2Min" column="i_2_min" jdbcType="FLOAT"/>
+            <result property="i2Avg" column="i_2_avg" jdbcType="FLOAT"/>
+            <result property="i2Cp95" column="i_2_cp95" jdbcType="FLOAT"/>
+            <result property="i3Max" column="i_3_max" jdbcType="FLOAT"/>
+            <result property="i3Min" column="i_3_min" jdbcType="FLOAT"/>
+            <result property="i3Avg" column="i_3_avg" jdbcType="FLOAT"/>
+            <result property="i3Cp95" column="i_3_cp95" jdbcType="FLOAT"/>
+            <result property="i4Max" column="i_4_max" jdbcType="FLOAT"/>
+            <result property="i4Min" column="i_4_min" jdbcType="FLOAT"/>
+            <result property="i4Avg" column="i_4_avg" jdbcType="FLOAT"/>
+            <result property="i4Cp95" column="i_4_cp95" jdbcType="FLOAT"/>
+            <result property="i5Max" column="i_5_max" jdbcType="FLOAT"/>
+            <result property="i5Min" column="i_5_min" jdbcType="FLOAT"/>
+            <result property="i5Avg" column="i_5_avg" jdbcType="FLOAT"/>
+            <result property="i5Cp95" column="i_5_cp95" jdbcType="FLOAT"/>
+            <result property="i6Max" column="i_6_max" jdbcType="FLOAT"/>
+            <result property="i6Min" column="i_6_min" jdbcType="FLOAT"/>
+            <result property="i6Avg" column="i_6_avg" jdbcType="FLOAT"/>
+            <result property="i6Cp95" column="i_6_cp95" jdbcType="FLOAT"/>
+            <result property="i7Max" column="i_7_max" jdbcType="FLOAT"/>
+            <result property="i7Min" column="i_7_min" jdbcType="FLOAT"/>
+            <result property="i7Avg" column="i_7_avg" jdbcType="FLOAT"/>
+            <result property="i7Cp95" column="i_7_cp95" jdbcType="FLOAT"/>
+            <result property="i8Max" column="i_8_max" jdbcType="FLOAT"/>
+            <result property="i8Min" column="i_8_min" jdbcType="FLOAT"/>
+            <result property="i8Avg" column="i_8_avg" jdbcType="FLOAT"/>
+            <result property="i8Cp95" column="i_8_cp95" jdbcType="FLOAT"/>
+            <result property="i9Max" column="i_9_max" jdbcType="FLOAT"/>
+            <result property="i9Min" column="i_9_min" jdbcType="FLOAT"/>
+            <result property="i9Avg" column="i_9_avg" jdbcType="FLOAT"/>
+            <result property="i9Cp95" column="i_9_cp95" jdbcType="FLOAT"/>
+            <result property="i10Max" column="i_10_max" jdbcType="FLOAT"/>
+            <result property="i10Min" column="i_10_min" jdbcType="FLOAT"/>
+            <result property="i10Avg" column="i_10_avg" jdbcType="FLOAT"/>
+            <result property="i10Cp95" column="i_10_cp95" jdbcType="FLOAT"/>
+            <result property="i11Max" column="i_11_max" jdbcType="FLOAT"/>
+            <result property="i11Min" column="i_11_min" jdbcType="FLOAT"/>
+            <result property="i11Avg" column="i_11_avg" jdbcType="FLOAT"/>
+            <result property="i11Cp95" column="i_11_cp95" jdbcType="FLOAT"/>
+            <result property="i12Max" column="i_12_max" jdbcType="FLOAT"/>
+            <result property="i12Min" column="i_12_min" jdbcType="FLOAT"/>
+            <result property="i12Avg" column="i_12_avg" jdbcType="FLOAT"/>
+            <result property="i12Cp95" column="i_12_cp95" jdbcType="FLOAT"/>
+            <result property="i13Max" column="i_13_max" jdbcType="FLOAT"/>
+            <result property="i13Min" column="i_13_min" jdbcType="FLOAT"/>
+            <result property="i13Avg" column="i_13_avg" jdbcType="FLOAT"/>
+            <result property="i13Cp95" column="i_13_cp95" jdbcType="FLOAT"/>
+            <result property="i14Max" column="i_14_max" jdbcType="FLOAT"/>
+            <result property="i14Min" column="i_14_min" jdbcType="FLOAT"/>
+            <result property="i14Avg" column="i_14_avg" jdbcType="FLOAT"/>
+            <result property="i14Cp95" column="i_14_cp95" jdbcType="FLOAT"/>
+            <result property="i15Max" column="i_15_max" jdbcType="FLOAT"/>
+            <result property="i15Min" column="i_15_min" jdbcType="FLOAT"/>
+            <result property="i15Avg" column="i_15_avg" jdbcType="FLOAT"/>
+            <result property="i15Cp95" column="i_15_cp95" jdbcType="FLOAT"/>
+            <result property="i16Max" column="i_16_max" jdbcType="FLOAT"/>
+            <result property="i16Min" column="i_16_min" jdbcType="FLOAT"/>
+            <result property="i16Avg" column="i_16_avg" jdbcType="FLOAT"/>
+            <result property="i16Cp95" column="i_16_cp95" jdbcType="FLOAT"/>
+            <result property="i17Max" column="i_17_max" jdbcType="FLOAT"/>
+            <result property="i17Min" column="i_17_min" jdbcType="FLOAT"/>
+            <result property="i17Avg" column="i_17_avg" jdbcType="FLOAT"/>
+            <result property="i17Cp95" column="i_17_cp95" jdbcType="FLOAT"/>
+            <result property="i18Max" column="i_18_max" jdbcType="FLOAT"/>
+            <result property="i18Min" column="i_18_min" jdbcType="FLOAT"/>
+            <result property="i18Avg" column="i_18_avg" jdbcType="FLOAT"/>
+            <result property="i18Cp95" column="i_18_cp95" jdbcType="FLOAT"/>
+            <result property="i19Max" column="i_19_max" jdbcType="FLOAT"/>
+            <result property="i19Min" column="i_19_min" jdbcType="FLOAT"/>
+            <result property="i19Avg" column="i_19_avg" jdbcType="FLOAT"/>
+            <result property="i19Cp95" column="i_19_cp95" jdbcType="FLOAT"/>
+            <result property="i20Max" column="i_20_max" jdbcType="FLOAT"/>
+            <result property="i20Min" column="i_20_min" jdbcType="FLOAT"/>
+            <result property="i20Avg" column="i_20_avg" jdbcType="FLOAT"/>
+            <result property="i20Cp95" column="i_20_cp95" jdbcType="FLOAT"/>
+            <result property="i21Max" column="i_21_max" jdbcType="FLOAT"/>
+            <result property="i21Min" column="i_21_min" jdbcType="FLOAT"/>
+            <result property="i21Avg" column="i_21_avg" jdbcType="FLOAT"/>
+            <result property="i21Cp95" column="i_21_cp95" jdbcType="FLOAT"/>
+            <result property="i22Max" column="i_22_max" jdbcType="FLOAT"/>
+            <result property="i22Min" column="i_22_min" jdbcType="FLOAT"/>
+            <result property="i22Avg" column="i_22_avg" jdbcType="FLOAT"/>
+            <result property="i22Cp95" column="i_22_cp95" jdbcType="FLOAT"/>
+            <result property="i23Max" column="i_23_max" jdbcType="FLOAT"/>
+            <result property="i23Min" column="i_23_min" jdbcType="FLOAT"/>
+            <result property="i23Avg" column="i_23_avg" jdbcType="FLOAT"/>
+            <result property="i23Cp95" column="i_23_cp95" jdbcType="FLOAT"/>
+            <result property="i24Max" column="i_24_max" jdbcType="FLOAT"/>
+            <result property="i24Min" column="i_24_min" jdbcType="FLOAT"/>
+            <result property="i24Avg" column="i_24_avg" jdbcType="FLOAT"/>
+            <result property="i24Cp95" column="i_24_cp95" jdbcType="FLOAT"/>
+            <result property="i25Max" column="i_25_max" jdbcType="FLOAT"/>
+            <result property="i25Min" column="i_25_min" jdbcType="FLOAT"/>
+            <result property="i25Avg" column="i_25_avg" jdbcType="FLOAT"/>
+            <result property="i25Cp95" column="i_25_cp95" jdbcType="FLOAT"/>
+            <result property="i26Max" column="i_26_max" jdbcType="FLOAT"/>
+            <result property="i26Min" column="i_26_min" jdbcType="FLOAT"/>
+            <result property="i26Avg" column="i_26_avg" jdbcType="FLOAT"/>
+            <result property="i26Cp95" column="i_26_cp95" jdbcType="FLOAT"/>
+            <result property="i27Max" column="i_27_max" jdbcType="FLOAT"/>
+            <result property="i27Min" column="i_27_min" jdbcType="FLOAT"/>
+            <result property="i27Avg" column="i_27_avg" jdbcType="FLOAT"/>
+            <result property="i27Cp95" column="i_27_cp95" jdbcType="FLOAT"/>
+            <result property="i28Max" column="i_28_max" jdbcType="FLOAT"/>
+            <result property="i28Min" column="i_28_min" jdbcType="FLOAT"/>
+            <result property="i28Avg" column="i_28_avg" jdbcType="FLOAT"/>
+            <result property="i28Cp95" column="i_28_cp95" jdbcType="FLOAT"/>
+            <result property="i29Max" column="i_29_max" jdbcType="FLOAT"/>
+            <result property="i29Min" column="i_29_min" jdbcType="FLOAT"/>
+            <result property="i29Avg" column="i_29_avg" jdbcType="FLOAT"/>
+            <result property="i29Cp95" column="i_29_cp95" jdbcType="FLOAT"/>
+            <result property="i30Max" column="i_30_max" jdbcType="FLOAT"/>
+            <result property="i30Min" column="i_30_min" jdbcType="FLOAT"/>
+            <result property="i30Avg" column="i_30_avg" jdbcType="FLOAT"/>
+            <result property="i30Cp95" column="i_30_cp95" jdbcType="FLOAT"/>
+            <result property="i31Max" column="i_31_max" jdbcType="FLOAT"/>
+            <result property="i31Min" column="i_31_min" jdbcType="FLOAT"/>
+            <result property="i31Avg" column="i_31_avg" jdbcType="FLOAT"/>
+            <result property="i31Cp95" column="i_31_cp95" jdbcType="FLOAT"/>
+            <result property="i32Max" column="i_32_max" jdbcType="FLOAT"/>
+            <result property="i32Min" column="i_32_min" jdbcType="FLOAT"/>
+            <result property="i32Avg" column="i_32_avg" jdbcType="FLOAT"/>
+            <result property="i32Cp95" column="i_32_cp95" jdbcType="FLOAT"/>
+            <result property="i33Max" column="i_33_max" jdbcType="FLOAT"/>
+            <result property="i33Min" column="i_33_min" jdbcType="FLOAT"/>
+            <result property="i33Avg" column="i_33_avg" jdbcType="FLOAT"/>
+            <result property="i33Cp95" column="i_33_cp95" jdbcType="FLOAT"/>
+            <result property="i34Max" column="i_34_max" jdbcType="FLOAT"/>
+            <result property="i34Min" column="i_34_min" jdbcType="FLOAT"/>
+            <result property="i34Avg" column="i_34_avg" jdbcType="FLOAT"/>
+            <result property="i34Cp95" column="i_34_cp95" jdbcType="FLOAT"/>
+            <result property="i35Max" column="i_35_max" jdbcType="FLOAT"/>
+            <result property="i35Min" column="i_35_min" jdbcType="FLOAT"/>
+            <result property="i35Avg" column="i_35_avg" jdbcType="FLOAT"/>
+            <result property="i35Cp95" column="i_35_cp95" jdbcType="FLOAT"/>
+            <result property="i36Max" column="i_36_max" jdbcType="FLOAT"/>
+            <result property="i36Min" column="i_36_min" jdbcType="FLOAT"/>
+            <result property="i36Avg" column="i_36_avg" jdbcType="FLOAT"/>
+            <result property="i36Cp95" column="i_36_cp95" jdbcType="FLOAT"/>
+            <result property="i37Max" column="i_37_max" jdbcType="FLOAT"/>
+            <result property="i37Min" column="i_37_min" jdbcType="FLOAT"/>
+            <result property="i37Avg" column="i_37_avg" jdbcType="FLOAT"/>
+            <result property="i37Cp95" column="i_37_cp95" jdbcType="FLOAT"/>
+            <result property="i38Max" column="i_38_max" jdbcType="FLOAT"/>
+            <result property="i38Min" column="i_38_min" jdbcType="FLOAT"/>
+            <result property="i38Avg" column="i_38_avg" jdbcType="FLOAT"/>
+            <result property="i38Cp95" column="i_38_cp95" jdbcType="FLOAT"/>
+            <result property="i39Max" column="i_39_max" jdbcType="FLOAT"/>
+            <result property="i39Min" column="i_39_min" jdbcType="FLOAT"/>
+            <result property="i39Avg" column="i_39_avg" jdbcType="FLOAT"/>
+            <result property="i39Cp95" column="i_39_cp95" jdbcType="FLOAT"/>
+            <result property="i40Max" column="i_40_max" jdbcType="FLOAT"/>
+            <result property="i40Min" column="i_40_min" jdbcType="FLOAT"/>
+            <result property="i40Avg" column="i_40_avg" jdbcType="FLOAT"/>
+            <result property="i40Cp95" column="i_40_cp95" jdbcType="FLOAT"/>
+            <result property="i41Max" column="i_41_max" jdbcType="FLOAT"/>
+            <result property="i41Min" column="i_41_min" jdbcType="FLOAT"/>
+            <result property="i41Avg" column="i_41_avg" jdbcType="FLOAT"/>
+            <result property="i41Cp95" column="i_41_cp95" jdbcType="FLOAT"/>
+            <result property="i42Max" column="i_42_max" jdbcType="FLOAT"/>
+            <result property="i42Min" column="i_42_min" jdbcType="FLOAT"/>
+            <result property="i42Avg" column="i_42_avg" jdbcType="FLOAT"/>
+            <result property="i42Cp95" column="i_42_cp95" jdbcType="FLOAT"/>
+            <result property="i43Max" column="i_43_max" jdbcType="FLOAT"/>
+            <result property="i43Min" column="i_43_min" jdbcType="FLOAT"/>
+            <result property="i43Avg" column="i_43_avg" jdbcType="FLOAT"/>
+            <result property="i43Cp95" column="i_43_cp95" jdbcType="FLOAT"/>
+            <result property="i44Max" column="i_44_max" jdbcType="FLOAT"/>
+            <result property="i44Min" column="i_44_min" jdbcType="FLOAT"/>
+            <result property="i44Avg" column="i_44_avg" jdbcType="FLOAT"/>
+            <result property="i44Cp95" column="i_44_cp95" jdbcType="FLOAT"/>
+            <result property="i45Max" column="i_45_max" jdbcType="FLOAT"/>
+            <result property="i45Min" column="i_45_min" jdbcType="FLOAT"/>
+            <result property="i45Avg" column="i_45_avg" jdbcType="FLOAT"/>
+            <result property="i45Cp95" column="i_45_cp95" jdbcType="FLOAT"/>
+            <result property="i46Max" column="i_46_max" jdbcType="FLOAT"/>
+            <result property="i46Min" column="i_46_min" jdbcType="FLOAT"/>
+            <result property="i46Avg" column="i_46_avg" jdbcType="FLOAT"/>
+            <result property="i46Cp95" column="i_46_cp95" jdbcType="FLOAT"/>
+            <result property="i47Max" column="i_47_max" jdbcType="FLOAT"/>
+            <result property="i47Min" column="i_47_min" jdbcType="FLOAT"/>
+            <result property="i47Avg" column="i_47_avg" jdbcType="FLOAT"/>
+            <result property="i47Cp95" column="i_47_cp95" jdbcType="FLOAT"/>
+            <result property="i48Max" column="i_48_max" jdbcType="FLOAT"/>
+            <result property="i48Min" column="i_48_min" jdbcType="FLOAT"/>
+            <result property="i48Avg" column="i_48_avg" jdbcType="FLOAT"/>
+            <result property="i48Cp95" column="i_48_cp95" jdbcType="FLOAT"/>
+            <result property="i49Max" column="i_49_max" jdbcType="FLOAT"/>
+            <result property="i49Min" column="i_49_min" jdbcType="FLOAT"/>
+            <result property="i49Avg" column="i_49_avg" jdbcType="FLOAT"/>
+            <result property="i49Cp95" column="i_49_cp95" jdbcType="FLOAT"/>
+            <result property="i50Max" column="i_50_max" jdbcType="FLOAT"/>
+            <result property="i50Min" column="i_50_min" jdbcType="FLOAT"/>
+            <result property="i50Avg" column="i_50_avg" jdbcType="FLOAT"/>
+            <result property="i50Cp95" column="i_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        i_2_max,i_2_min,i_2_avg,
+        i_2_cp95,i_3_max,i_3_min,
+        i_3_avg,i_3_cp95,i_4_max,
+        i_4_min,i_4_avg,i_4_cp95,
+        i_5_max,i_5_min,i_5_avg,
+        i_5_cp95,i_6_max,i_6_min,
+        i_6_avg,i_6_cp95,i_7_max,
+        i_7_min,i_7_avg,i_7_cp95,
+        i_8_max,i_8_min,i_8_avg,
+        i_8_cp95,i_9_max,i_9_min,
+        i_9_avg,i_9_cp95,i_10_max,
+        i_10_min,i_10_avg,i_10_cp95,
+        i_11_max,i_11_min,i_11_avg,
+        i_11_cp95,i_12_max,i_12_min,
+        i_12_avg,i_12_cp95,i_13_max,
+        i_13_min,i_13_avg,i_13_cp95,
+        i_14_max,i_14_min,i_14_avg,
+        i_14_cp95,i_15_max,i_15_min,
+        i_15_avg,i_15_cp95,i_16_max,
+        i_16_min,i_16_avg,i_16_cp95,
+        i_17_max,i_17_min,i_17_avg,
+        i_17_cp95,i_18_max,i_18_min,
+        i_18_avg,i_18_cp95,i_19_max,
+        i_19_min,i_19_avg,i_19_cp95,
+        i_20_max,i_20_min,i_20_avg,
+        i_20_cp95,i_21_max,i_21_min,
+        i_21_avg,i_21_cp95,i_22_max,
+        i_22_min,i_22_avg,i_22_cp95,
+        i_23_max,i_23_min,i_23_avg,
+        i_23_cp95,i_24_max,i_24_min,
+        i_24_avg,i_24_cp95,i_25_max,
+        i_25_min,i_25_avg,i_25_cp95,
+        i_26_max,i_26_min,i_26_avg,
+        i_26_cp95,i_27_max,i_27_min,
+        i_27_avg,i_27_cp95,i_28_max,
+        i_28_min,i_28_avg,i_28_cp95,
+        i_29_max,i_29_min,i_29_avg,
+        i_29_cp95,i_30_max,i_30_min,
+        i_30_avg,i_30_cp95,i_31_max,
+        i_31_min,i_31_avg,i_31_cp95,
+        i_32_max,i_32_min,i_32_avg,
+        i_32_cp95,i_33_max,i_33_min,
+        i_33_avg,i_33_cp95,i_34_max,
+        i_34_min,i_34_avg,i_34_cp95,
+        i_35_max,i_35_min,i_35_avg,
+        i_35_cp95,i_36_max,i_36_min,
+        i_36_avg,i_36_cp95,i_37_max,
+        i_37_min,i_37_avg,i_37_cp95,
+        i_38_max,i_38_min,i_38_avg,
+        i_38_cp95,i_39_max,i_39_min,
+        i_39_avg,i_39_cp95,i_40_max,
+        i_40_min,i_40_avg,i_40_cp95,
+        i_41_max,i_41_min,i_41_avg,
+        i_41_cp95,i_42_max,i_42_min,
+        i_42_avg,i_42_cp95,i_43_max,
+        i_43_min,i_43_avg,i_43_cp95,
+        i_44_max,i_44_min,i_44_avg,
+        i_44_cp95,i_45_max,i_45_min,
+        i_45_avg,i_45_cp95,i_46_max,
+        i_46_min,i_46_avg,i_46_cp95,
+        i_47_max,i_47_min,i_47_avg,
+        i_47_cp95,i_48_max,i_48_min,
+        i_48_avg,i_48_cp95,i_49_max,
+        i_49_min,i_49_avg,i_49_cp95,
+        i_50_max,i_50_min,i_50_avg,
+        i_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_i_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;= #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,303 @@
+<?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.RMpHarmonicVRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="voltageHarmonicThdMax" column="voltage_harmonic_thd_max" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThdMin" column="voltage_harmonic_thd_min" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThdAvg" column="voltage_harmonic_thd_avg" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThd95" column="voltage_harmonic_thd_95" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageMax" column="fundamental_voltage_max" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageMin" column="fundamental_voltage_min" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageAvg" column="fundamental_voltage_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltage95" column="fundamental_voltage_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Max" column="harmonic_voltage_content_2_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Min" column="harmonic_voltage_content_2_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Avg" column="harmonic_voltage_content_2_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent295" column="harmonic_voltage_content_2_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Max" column="harmonic_voltage_content_3_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Min" column="harmonic_voltage_content_3_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Avg" column="harmonic_voltage_content_3_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent395" column="harmonic_voltage_content_3_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Max" column="harmonic_voltage_content_4_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Min" column="harmonic_voltage_content_4_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Avg" column="harmonic_voltage_content_4_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent495" column="harmonic_voltage_content_4_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Max" column="harmonic_voltage_content_5_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Min" column="harmonic_voltage_content_5_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Avg" column="harmonic_voltage_content_5_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent595" column="harmonic_voltage_content_5_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Max" column="harmonic_voltage_content_6_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Min" column="harmonic_voltage_content_6_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Avg" column="harmonic_voltage_content_6_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent695" column="harmonic_voltage_content_6_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Max" column="harmonic_voltage_content_7_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Min" column="harmonic_voltage_content_7_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Avg" column="harmonic_voltage_content_7_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent795" column="harmonic_voltage_content_7_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Max" column="harmonic_voltage_content_8_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Min" column="harmonic_voltage_content_8_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Avg" column="harmonic_voltage_content_8_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent895" column="harmonic_voltage_content_8_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Max" column="harmonic_voltage_content_9_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Min" column="harmonic_voltage_content_9_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Avg" column="harmonic_voltage_content_9_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent995" column="harmonic_voltage_content_9_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Max" column="harmonic_voltage_content_10_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Min" column="harmonic_voltage_content_10_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Avg" column="harmonic_voltage_content_10_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1095" column="harmonic_voltage_content_10_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Max" column="harmonic_voltage_content_11_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Min" column="harmonic_voltage_content_11_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Avg" column="harmonic_voltage_content_11_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1195" column="harmonic_voltage_content_11_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Max" column="harmonic_voltage_content_12_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Min" column="harmonic_voltage_content_12_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Avg" column="harmonic_voltage_content_12_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1295" column="harmonic_voltage_content_12_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Max" column="harmonic_voltage_content_13_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Min" column="harmonic_voltage_content_13_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Avg" column="harmonic_voltage_content_13_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1395" column="harmonic_voltage_content_13_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Max" column="harmonic_voltage_content_14_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Min" column="harmonic_voltage_content_14_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Avg" column="harmonic_voltage_content_14_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1495" column="harmonic_voltage_content_14_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Max" column="harmonic_voltage_content_15_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Min" column="harmonic_voltage_content_15_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Avg" column="harmonic_voltage_content_15_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1595" column="harmonic_voltage_content_15_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Max" column="harmonic_voltage_content_16_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Min" column="harmonic_voltage_content_16_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Avg" column="harmonic_voltage_content_16_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1695" column="harmonic_voltage_content_16_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Max" column="harmonic_voltage_content_17_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Min" column="harmonic_voltage_content_17_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Avg" column="harmonic_voltage_content_17_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1795" column="harmonic_voltage_content_17_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Max" column="harmonic_voltage_content_18_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Min" column="harmonic_voltage_content_18_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Avg" column="harmonic_voltage_content_18_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1895" column="harmonic_voltage_content_18_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Max" column="harmonic_voltage_content_19_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Min" column="harmonic_voltage_content_19_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Avg" column="harmonic_voltage_content_19_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1995" column="harmonic_voltage_content_19_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Max" column="harmonic_voltage_content_20_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Min" column="harmonic_voltage_content_20_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Avg" column="harmonic_voltage_content_20_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2095" column="harmonic_voltage_content_20_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Max" column="harmonic_voltage_content_21_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Min" column="harmonic_voltage_content_21_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Avg" column="harmonic_voltage_content_21_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2195" column="harmonic_voltage_content_21_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Max" column="harmonic_voltage_content_22_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Min" column="harmonic_voltage_content_22_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Avg" column="harmonic_voltage_content_22_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2295" column="harmonic_voltage_content_22_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Max" column="harmonic_voltage_content_23_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Min" column="harmonic_voltage_content_23_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Avg" column="harmonic_voltage_content_23_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2395" column="harmonic_voltage_content_23_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Max" column="harmonic_voltage_content_24_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Min" column="harmonic_voltage_content_24_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Avg" column="harmonic_voltage_content_24_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2495" column="harmonic_voltage_content_24_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Max" column="harmonic_voltage_content_25_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Min" column="harmonic_voltage_content_25_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Avg" column="harmonic_voltage_content_25_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2595" column="harmonic_voltage_content_25_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Max" column="harmonic_voltage_content_26_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Min" column="harmonic_voltage_content_26_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Avg" column="harmonic_voltage_content_26_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2695" column="harmonic_voltage_content_26_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Max" column="harmonic_voltage_content_27_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Min" column="harmonic_voltage_content_27_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Avg" column="harmonic_voltage_content_27_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2795" column="harmonic_voltage_content_27_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Max" column="harmonic_voltage_content_28_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Min" column="harmonic_voltage_content_28_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Avg" column="harmonic_voltage_content_28_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2895" column="harmonic_voltage_content_28_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Max" column="harmonic_voltage_content_29_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Min" column="harmonic_voltage_content_29_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Avg" column="harmonic_voltage_content_29_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2995" column="harmonic_voltage_content_29_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Max" column="harmonic_voltage_content_30_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Min" column="harmonic_voltage_content_30_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Avg" column="harmonic_voltage_content_30_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3095" column="harmonic_voltage_content_30_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Max" column="harmonic_voltage_content_31_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Min" column="harmonic_voltage_content_31_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Avg" column="harmonic_voltage_content_31_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3195" column="harmonic_voltage_content_31_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Max" column="harmonic_voltage_content_32_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Min" column="harmonic_voltage_content_32_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Avg" column="harmonic_voltage_content_32_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3295" column="harmonic_voltage_content_32_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Max" column="harmonic_voltage_content_33_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Min" column="harmonic_voltage_content_33_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Avg" column="harmonic_voltage_content_33_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3395" column="harmonic_voltage_content_33_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Max" column="harmonic_voltage_content_34_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Min" column="harmonic_voltage_content_34_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Avg" column="harmonic_voltage_content_34_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3495" column="harmonic_voltage_content_34_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Max" column="harmonic_voltage_content_35_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Min" column="harmonic_voltage_content_35_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Avg" column="harmonic_voltage_content_35_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3595" column="harmonic_voltage_content_35_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Max" column="harmonic_voltage_content_36_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Min" column="harmonic_voltage_content_36_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Avg" column="harmonic_voltage_content_36_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3695" column="harmonic_voltage_content_36_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Max" column="harmonic_voltage_content_37_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Min" column="harmonic_voltage_content_37_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Avg" column="harmonic_voltage_content_37_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3795" column="harmonic_voltage_content_37_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Max" column="harmonic_voltage_content_38_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Min" column="harmonic_voltage_content_38_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Avg" column="harmonic_voltage_content_38_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3895" column="harmonic_voltage_content_38_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Max" column="harmonic_voltage_content_39_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Min" column="harmonic_voltage_content_39_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Avg" column="harmonic_voltage_content_39_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3995" column="harmonic_voltage_content_39_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Max" column="harmonic_voltage_content_40_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Min" column="harmonic_voltage_content_40_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Avg" column="harmonic_voltage_content_40_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4095" column="harmonic_voltage_content_40_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Max" column="harmonic_voltage_content_41_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Min" column="harmonic_voltage_content_41_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Avg" column="harmonic_voltage_content_41_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4195" column="harmonic_voltage_content_41_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Max" column="harmonic_voltage_content_42_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Min" column="harmonic_voltage_content_42_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Avg" column="harmonic_voltage_content_42_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4295" column="harmonic_voltage_content_42_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Max" column="harmonic_voltage_content_43_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Min" column="harmonic_voltage_content_43_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Avg" column="harmonic_voltage_content_43_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4395" column="harmonic_voltage_content_43_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Max" column="harmonic_voltage_content_44_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Min" column="harmonic_voltage_content_44_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Avg" column="harmonic_voltage_content_44_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4495" column="harmonic_voltage_content_44_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Max" column="harmonic_voltage_content_45_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Min" column="harmonic_voltage_content_45_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Avg" column="harmonic_voltage_content_45_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4595" column="harmonic_voltage_content_45_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Max" column="harmonic_voltage_content_46_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Min" column="harmonic_voltage_content_46_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Avg" column="harmonic_voltage_content_46_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4695" column="harmonic_voltage_content_46_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Max" column="harmonic_voltage_content_47_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Min" column="harmonic_voltage_content_47_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Avg" column="harmonic_voltage_content_47_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4795" column="harmonic_voltage_content_47_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Max" column="harmonic_voltage_content_48_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Min" column="harmonic_voltage_content_48_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Avg" column="harmonic_voltage_content_48_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4895" column="harmonic_voltage_content_48_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Max" column="harmonic_voltage_content_49_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Min" column="harmonic_voltage_content_49_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Avg" column="harmonic_voltage_content_49_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4995" column="harmonic_voltage_content_49_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Max" column="harmonic_voltage_content_50_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Min" column="harmonic_voltage_content_50_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Avg" column="harmonic_voltage_content_50_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5095" column="harmonic_voltage_content_50_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        voltage_harmonic_thd_max,voltage_harmonic_thd_min,voltage_harmonic_thd_avg,
+        voltage_harmonic_thd_95,fundamental_voltage_max,fundamental_voltage_min,
+        fundamental_voltage_avg,fundamental_voltage_95,harmonic_voltage_content_2_max,
+        harmonic_voltage_content_2_min,harmonic_voltage_content_2_avg,harmonic_voltage_content_2_95,
+        harmonic_voltage_content_3_max,harmonic_voltage_content_3_min,harmonic_voltage_content_3_avg,
+        harmonic_voltage_content_3_95,harmonic_voltage_content_4_max,harmonic_voltage_content_4_min,
+        harmonic_voltage_content_4_avg,harmonic_voltage_content_4_95,harmonic_voltage_content_5_max,
+        harmonic_voltage_content_5_min,harmonic_voltage_content_5_avg,harmonic_voltage_content_5_95,
+        harmonic_voltage_content_6_max,harmonic_voltage_content_6_min,harmonic_voltage_content_6_avg,
+        harmonic_voltage_content_6_95,harmonic_voltage_content_7_max,harmonic_voltage_content_7_min,
+        harmonic_voltage_content_7_avg,harmonic_voltage_content_7_95,harmonic_voltage_content_8_max,
+        harmonic_voltage_content_8_min,harmonic_voltage_content_8_avg,harmonic_voltage_content_8_95,
+        harmonic_voltage_content_9_max,harmonic_voltage_content_9_min,harmonic_voltage_content_9_avg,
+        harmonic_voltage_content_9_95,harmonic_voltage_content_10_max,harmonic_voltage_content_10_min,
+        harmonic_voltage_content_10_avg,harmonic_voltage_content_10_95,harmonic_voltage_content_11_max,
+        harmonic_voltage_content_11_min,harmonic_voltage_content_11_avg,harmonic_voltage_content_11_95,
+        harmonic_voltage_content_12_max,harmonic_voltage_content_12_min,harmonic_voltage_content_12_avg,
+        harmonic_voltage_content_12_95,harmonic_voltage_content_13_max,harmonic_voltage_content_13_min,
+        harmonic_voltage_content_13_avg,harmonic_voltage_content_13_95,harmonic_voltage_content_14_max,
+        harmonic_voltage_content_14_min,harmonic_voltage_content_14_avg,harmonic_voltage_content_14_95,
+        harmonic_voltage_content_15_max,harmonic_voltage_content_15_min,harmonic_voltage_content_15_avg,
+        harmonic_voltage_content_15_95,harmonic_voltage_content_16_max,harmonic_voltage_content_16_min,
+        harmonic_voltage_content_16_avg,harmonic_voltage_content_16_95,harmonic_voltage_content_17_max,
+        harmonic_voltage_content_17_min,harmonic_voltage_content_17_avg,harmonic_voltage_content_17_95,
+        harmonic_voltage_content_18_max,harmonic_voltage_content_18_min,harmonic_voltage_content_18_avg,
+        harmonic_voltage_content_18_95,harmonic_voltage_content_19_max,harmonic_voltage_content_19_min,
+        harmonic_voltage_content_19_avg,harmonic_voltage_content_19_95,harmonic_voltage_content_20_max,
+        harmonic_voltage_content_20_min,harmonic_voltage_content_20_avg,harmonic_voltage_content_20_95,
+        harmonic_voltage_content_21_max,harmonic_voltage_content_21_min,harmonic_voltage_content_21_avg,
+        harmonic_voltage_content_21_95,harmonic_voltage_content_22_max,harmonic_voltage_content_22_min,
+        harmonic_voltage_content_22_avg,harmonic_voltage_content_22_95,harmonic_voltage_content_23_max,
+        harmonic_voltage_content_23_min,harmonic_voltage_content_23_avg,harmonic_voltage_content_23_95,
+        harmonic_voltage_content_24_max,harmonic_voltage_content_24_min,harmonic_voltage_content_24_avg,
+        harmonic_voltage_content_24_95,harmonic_voltage_content_25_max,harmonic_voltage_content_25_min,
+        harmonic_voltage_content_25_avg,harmonic_voltage_content_25_95,harmonic_voltage_content_26_max,
+        harmonic_voltage_content_26_min,harmonic_voltage_content_26_avg,harmonic_voltage_content_26_95,
+        harmonic_voltage_content_27_max,harmonic_voltage_content_27_min,harmonic_voltage_content_27_avg,
+        harmonic_voltage_content_27_95,harmonic_voltage_content_28_max,harmonic_voltage_content_28_min,
+        harmonic_voltage_content_28_avg,harmonic_voltage_content_28_95,harmonic_voltage_content_29_max,
+        harmonic_voltage_content_29_min,harmonic_voltage_content_29_avg,harmonic_voltage_content_29_95,
+        harmonic_voltage_content_30_max,harmonic_voltage_content_30_min,harmonic_voltage_content_30_avg,
+        harmonic_voltage_content_30_95,harmonic_voltage_content_31_max,harmonic_voltage_content_31_min,
+        harmonic_voltage_content_31_avg,harmonic_voltage_content_31_95,harmonic_voltage_content_32_max,
+        harmonic_voltage_content_32_min,harmonic_voltage_content_32_avg,harmonic_voltage_content_32_95,
+        harmonic_voltage_content_33_max,harmonic_voltage_content_33_min,harmonic_voltage_content_33_avg,
+        harmonic_voltage_content_33_95,harmonic_voltage_content_34_max,harmonic_voltage_content_34_min,
+        harmonic_voltage_content_34_avg,harmonic_voltage_content_34_95,harmonic_voltage_content_35_max,
+        harmonic_voltage_content_35_min,harmonic_voltage_content_35_avg,harmonic_voltage_content_35_95,
+        harmonic_voltage_content_36_max,harmonic_voltage_content_36_min,harmonic_voltage_content_36_avg,
+        harmonic_voltage_content_36_95,harmonic_voltage_content_37_max,harmonic_voltage_content_37_min,
+        harmonic_voltage_content_37_avg,harmonic_voltage_content_37_95,harmonic_voltage_content_38_max,
+        harmonic_voltage_content_38_min,harmonic_voltage_content_38_avg,harmonic_voltage_content_38_95,
+        harmonic_voltage_content_39_max,harmonic_voltage_content_39_min,harmonic_voltage_content_39_avg,
+        harmonic_voltage_content_39_95,harmonic_voltage_content_40_max,harmonic_voltage_content_40_min,
+        harmonic_voltage_content_40_avg,harmonic_voltage_content_40_95,harmonic_voltage_content_41_max,
+        harmonic_voltage_content_41_min,harmonic_voltage_content_41_avg,harmonic_voltage_content_41_95,
+        harmonic_voltage_content_42_max,harmonic_voltage_content_42_min,harmonic_voltage_content_42_avg,
+        harmonic_voltage_content_42_95,harmonic_voltage_content_43_max,harmonic_voltage_content_43_min,
+        harmonic_voltage_content_43_avg,harmonic_voltage_content_43_95,harmonic_voltage_content_44_max,
+        harmonic_voltage_content_44_min,harmonic_voltage_content_44_avg,harmonic_voltage_content_44_95,
+        harmonic_voltage_content_45_max,harmonic_voltage_content_45_min,harmonic_voltage_content_45_avg,
+        harmonic_voltage_content_45_95,harmonic_voltage_content_46_max,harmonic_voltage_content_46_min,
+        harmonic_voltage_content_46_avg,harmonic_voltage_content_46_95,harmonic_voltage_content_47_max,
+        harmonic_voltage_content_47_min,harmonic_voltage_content_47_avg,harmonic_voltage_content_47_95,
+        harmonic_voltage_content_48_max,harmonic_voltage_content_48_min,harmonic_voltage_content_48_avg,
+        harmonic_voltage_content_48_95,harmonic_voltage_content_49_max,harmonic_voltage_content_49_min,
+        harmonic_voltage_content_49_avg,harmonic_voltage_content_49_95,harmonic_voltage_content_50_max,
+        harmonic_voltage_content_50_min,harmonic_voltage_content_50_avg,harmonic_voltage_content_50_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_v_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,293 @@
+<?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.RMpInharmonicIRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="inharmI2Max" column="inharm_i_2_max" jdbcType="FLOAT"/>
+            <result property="inharmI2Min" column="inharm_i_2_min" jdbcType="FLOAT"/>
+            <result property="inharmI2Avg" column="inharm_i_2_avg" jdbcType="FLOAT"/>
+            <result property="inharmI2Cp95" column="inharm_i_2_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI3Max" column="inharm_i_3_max" jdbcType="FLOAT"/>
+            <result property="inharmI3Min" column="inharm_i_3_min" jdbcType="FLOAT"/>
+            <result property="inharmI3Avg" column="inharm_i_3_avg" jdbcType="FLOAT"/>
+            <result property="inharmI3Cp95" column="inharm_i_3_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI4Max" column="inharm_i_4_max" jdbcType="FLOAT"/>
+            <result property="inharmI4Min" column="inharm_i_4_min" jdbcType="FLOAT"/>
+            <result property="inharmI4Avg" column="inharm_i_4_avg" jdbcType="FLOAT"/>
+            <result property="inharmI4Cp95" column="inharm_i_4_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI5Max" column="inharm_i_5_max" jdbcType="FLOAT"/>
+            <result property="inharmI5Min" column="inharm_i_5_min" jdbcType="FLOAT"/>
+            <result property="inharmI5Avg" column="inharm_i_5_avg" jdbcType="FLOAT"/>
+            <result property="inharmI5Cp95" column="inharm_i_5_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI6Max" column="inharm_i_6_max" jdbcType="FLOAT"/>
+            <result property="inharmI6Min" column="inharm_i_6_min" jdbcType="FLOAT"/>
+            <result property="inharmI6Avg" column="inharm_i_6_avg" jdbcType="FLOAT"/>
+            <result property="inharmI6Cp95" column="inharm_i_6_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI7Max" column="inharm_i_7_max" jdbcType="FLOAT"/>
+            <result property="inharmI7Min" column="inharm_i_7_min" jdbcType="FLOAT"/>
+            <result property="inharmI7Avg" column="inharm_i_7_avg" jdbcType="FLOAT"/>
+            <result property="inharmI7Cp95" column="inharm_i_7_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI8Max" column="inharm_i_8_max" jdbcType="FLOAT"/>
+            <result property="inharmI8Min" column="inharm_i_8_min" jdbcType="FLOAT"/>
+            <result property="inharmI8Avg" column="inharm_i_8_avg" jdbcType="FLOAT"/>
+            <result property="inharmI8Cp95" column="inharm_i_8_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI9Max" column="inharm_i_9_max" jdbcType="FLOAT"/>
+            <result property="inharmI9Min" column="inharm_i_9_min" jdbcType="FLOAT"/>
+            <result property="inharmI9Avg" column="inharm_i_9_avg" jdbcType="FLOAT"/>
+            <result property="inharmI9Cp95" column="inharm_i_9_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI10Max" column="inharm_i_10_max" jdbcType="FLOAT"/>
+            <result property="inharmI10Min" column="inharm_i_10_min" jdbcType="FLOAT"/>
+            <result property="inharmI10Avg" column="inharm_i_10_avg" jdbcType="FLOAT"/>
+            <result property="inharmI10Cp95" column="inharm_i_10_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI11Max" column="inharm_i_11_max" jdbcType="FLOAT"/>
+            <result property="inharmI11Min" column="inharm_i_11_min" jdbcType="FLOAT"/>
+            <result property="inharmI11Avg" column="inharm_i_11_avg" jdbcType="FLOAT"/>
+            <result property="inharmI11Cp95" column="inharm_i_11_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI12Max" column="inharm_i_12_max" jdbcType="FLOAT"/>
+            <result property="inharmI12Min" column="inharm_i_12_min" jdbcType="FLOAT"/>
+            <result property="inharmI12Avg" column="inharm_i_12_avg" jdbcType="FLOAT"/>
+            <result property="inharmI12Cp95" column="inharm_i_12_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI13Max" column="inharm_i_13_max" jdbcType="FLOAT"/>
+            <result property="inharmI13Min" column="inharm_i_13_min" jdbcType="FLOAT"/>
+            <result property="inharmI13Avg" column="inharm_i_13_avg" jdbcType="FLOAT"/>
+            <result property="inharmI13Cp95" column="inharm_i_13_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI14Max" column="inharm_i_14_max" jdbcType="FLOAT"/>
+            <result property="inharmI14Min" column="inharm_i_14_min" jdbcType="FLOAT"/>
+            <result property="inharmI14Avg" column="inharm_i_14_avg" jdbcType="FLOAT"/>
+            <result property="inharmI14Cp95" column="inharm_i_14_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI15Max" column="inharm_i_15_max" jdbcType="FLOAT"/>
+            <result property="inharmI15Min" column="inharm_i_15_min" jdbcType="FLOAT"/>
+            <result property="inharmI15Avg" column="inharm_i_15_avg" jdbcType="FLOAT"/>
+            <result property="inharmI15Cp95" column="inharm_i_15_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI16Max" column="inharm_i_16_max" jdbcType="FLOAT"/>
+            <result property="inharmI16Min" column="inharm_i_16_min" jdbcType="FLOAT"/>
+            <result property="inharmI16Avg" column="inharm_i_16_avg" jdbcType="FLOAT"/>
+            <result property="inharmI16Cp95" column="inharm_i_16_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI17Max" column="inharm_i_17_max" jdbcType="FLOAT"/>
+            <result property="inharmI17Min" column="inharm_i_17_min" jdbcType="FLOAT"/>
+            <result property="inharmI17Avg" column="inharm_i_17_avg" jdbcType="FLOAT"/>
+            <result property="inharmI17Cp95" column="inharm_i_17_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI18Max" column="inharm_i_18_max" jdbcType="FLOAT"/>
+            <result property="inharmI18Min" column="inharm_i_18_min" jdbcType="FLOAT"/>
+            <result property="inharmI18Avg" column="inharm_i_18_avg" jdbcType="FLOAT"/>
+            <result property="inharmI18Cp95" column="inharm_i_18_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI19Max" column="inharm_i_19_max" jdbcType="FLOAT"/>
+            <result property="inharmI19Min" column="inharm_i_19_min" jdbcType="FLOAT"/>
+            <result property="inharmI19Avg" column="inharm_i_19_avg" jdbcType="FLOAT"/>
+            <result property="inharmI19Cp95" column="inharm_i_19_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI20Max" column="inharm_i_20_max" jdbcType="FLOAT"/>
+            <result property="inharmI20Min" column="inharm_i_20_min" jdbcType="FLOAT"/>
+            <result property="inharmI20Avg" column="inharm_i_20_avg" jdbcType="FLOAT"/>
+            <result property="inharmI20Cp95" column="inharm_i_20_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI21Max" column="inharm_i_21_max" jdbcType="FLOAT"/>
+            <result property="inharmI21Min" column="inharm_i_21_min" jdbcType="FLOAT"/>
+            <result property="inharmI21Avg" column="inharm_i_21_avg" jdbcType="FLOAT"/>
+            <result property="inharmI21Cp95" column="inharm_i_21_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI22Max" column="inharm_i_22_max" jdbcType="FLOAT"/>
+            <result property="inharmI22Min" column="inharm_i_22_min" jdbcType="FLOAT"/>
+            <result property="inharmI22Avg" column="inharm_i_22_avg" jdbcType="FLOAT"/>
+            <result property="inharmI22Cp95" column="inharm_i_22_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI23Max" column="inharm_i_23_max" jdbcType="FLOAT"/>
+            <result property="inharmI23Min" column="inharm_i_23_min" jdbcType="FLOAT"/>
+            <result property="inharmI23Avg" column="inharm_i_23_avg" jdbcType="FLOAT"/>
+            <result property="inharmI23Cp95" column="inharm_i_23_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI24Max" column="inharm_i_24_max" jdbcType="FLOAT"/>
+            <result property="inharmI24Min" column="inharm_i_24_min" jdbcType="FLOAT"/>
+            <result property="inharmI24Avg" column="inharm_i_24_avg" jdbcType="FLOAT"/>
+            <result property="inharmI24Cp95" column="inharm_i_24_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI25Max" column="inharm_i_25_max" jdbcType="FLOAT"/>
+            <result property="inharmI25Min" column="inharm_i_25_min" jdbcType="FLOAT"/>
+            <result property="inharmI25Avg" column="inharm_i_25_avg" jdbcType="FLOAT"/>
+            <result property="inharmI25Cp95" column="inharm_i_25_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI26Max" column="inharm_i_26_max" jdbcType="FLOAT"/>
+            <result property="inharmI26Min" column="inharm_i_26_min" jdbcType="FLOAT"/>
+            <result property="inharmI26Avg" column="inharm_i_26_avg" jdbcType="FLOAT"/>
+            <result property="inharmI26Cp95" column="inharm_i_26_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI27Max" column="inharm_i_27_max" jdbcType="FLOAT"/>
+            <result property="inharmI27Min" column="inharm_i_27_min" jdbcType="FLOAT"/>
+            <result property="inharmI27Avg" column="inharm_i_27_avg" jdbcType="FLOAT"/>
+            <result property="inharmI27Cp95" column="inharm_i_27_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI28Max" column="inharm_i_28_max" jdbcType="FLOAT"/>
+            <result property="inharmI28Min" column="inharm_i_28_min" jdbcType="FLOAT"/>
+            <result property="inharmI28Avg" column="inharm_i_28_avg" jdbcType="FLOAT"/>
+            <result property="inharmI28Cp95" column="inharm_i_28_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI29Max" column="inharm_i_29_max" jdbcType="FLOAT"/>
+            <result property="inharmI29Min" column="inharm_i_29_min" jdbcType="FLOAT"/>
+            <result property="inharmI29Avg" column="inharm_i_29_avg" jdbcType="FLOAT"/>
+            <result property="inharmI29Cp95" column="inharm_i_29_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI30Max" column="inharm_i_30_max" jdbcType="FLOAT"/>
+            <result property="inharmI30Min" column="inharm_i_30_min" jdbcType="FLOAT"/>
+            <result property="inharmI30Avg" column="inharm_i_30_avg" jdbcType="FLOAT"/>
+            <result property="inharmI30Cp95" column="inharm_i_30_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI31Max" column="inharm_i_31_max" jdbcType="FLOAT"/>
+            <result property="inharmI31Min" column="inharm_i_31_min" jdbcType="FLOAT"/>
+            <result property="inharmI31Avg" column="inharm_i_31_avg" jdbcType="FLOAT"/>
+            <result property="inharmI31Cp95" column="inharm_i_31_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI32Max" column="inharm_i_32_max" jdbcType="FLOAT"/>
+            <result property="inharmI32Min" column="inharm_i_32_min" jdbcType="FLOAT"/>
+            <result property="inharmI32Avg" column="inharm_i_32_avg" jdbcType="FLOAT"/>
+            <result property="inharmI32Cp95" column="inharm_i_32_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI33Max" column="inharm_i_33_max" jdbcType="FLOAT"/>
+            <result property="inharmI33Min" column="inharm_i_33_min" jdbcType="FLOAT"/>
+            <result property="inharmI33Avg" column="inharm_i_33_avg" jdbcType="FLOAT"/>
+            <result property="inharmI33Cp95" column="inharm_i_33_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI34Max" column="inharm_i_34_max" jdbcType="FLOAT"/>
+            <result property="inharmI34Min" column="inharm_i_34_min" jdbcType="FLOAT"/>
+            <result property="inharmI34Avg" column="inharm_i_34_avg" jdbcType="FLOAT"/>
+            <result property="inharmI34Cp95" column="inharm_i_34_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI35Max" column="inharm_i_35_max" jdbcType="FLOAT"/>
+            <result property="inharmI35Min" column="inharm_i_35_min" jdbcType="FLOAT"/>
+            <result property="inharmI35Avg" column="inharm_i_35_avg" jdbcType="FLOAT"/>
+            <result property="inharmI35Cp95" column="inharm_i_35_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI36Max" column="inharm_i_36_max" jdbcType="FLOAT"/>
+            <result property="inharmI36Min" column="inharm_i_36_min" jdbcType="FLOAT"/>
+            <result property="inharmI36Avg" column="inharm_i_36_avg" jdbcType="FLOAT"/>
+            <result property="inharmI36Cp95" column="inharm_i_36_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI37Max" column="inharm_i_37_max" jdbcType="FLOAT"/>
+            <result property="inharmI37Min" column="inharm_i_37_min" jdbcType="FLOAT"/>
+            <result property="inharmI37Avg" column="inharm_i_37_avg" jdbcType="FLOAT"/>
+            <result property="inharmI37Cp95" column="inharm_i_37_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI38Max" column="inharm_i_38_max" jdbcType="FLOAT"/>
+            <result property="inharmI38Min" column="inharm_i_38_min" jdbcType="FLOAT"/>
+            <result property="inharmI38Avg" column="inharm_i_38_avg" jdbcType="FLOAT"/>
+            <result property="inharmI38Cp95" column="inharm_i_38_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI39Max" column="inharm_i_39_max" jdbcType="FLOAT"/>
+            <result property="inharmI39Min" column="inharm_i_39_min" jdbcType="FLOAT"/>
+            <result property="inharmI39Avg" column="inharm_i_39_avg" jdbcType="FLOAT"/>
+            <result property="inharmI39Cp95" column="inharm_i_39_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI40Max" column="inharm_i_40_max" jdbcType="FLOAT"/>
+            <result property="inharmI40Min" column="inharm_i_40_min" jdbcType="FLOAT"/>
+            <result property="inharmI40Avg" column="inharm_i_40_avg" jdbcType="FLOAT"/>
+            <result property="inharmI40Cp95" column="inharm_i_40_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI41Max" column="inharm_i_41_max" jdbcType="FLOAT"/>
+            <result property="inharmI41Min" column="inharm_i_41_min" jdbcType="FLOAT"/>
+            <result property="inharmI41Avg" column="inharm_i_41_avg" jdbcType="FLOAT"/>
+            <result property="inharmI41Cp95" column="inharm_i_41_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI42Max" column="inharm_i_42_max" jdbcType="FLOAT"/>
+            <result property="inharmI42Min" column="inharm_i_42_min" jdbcType="FLOAT"/>
+            <result property="inharmI42Avg" column="inharm_i_42_avg" jdbcType="FLOAT"/>
+            <result property="inharmI42Cp95" column="inharm_i_42_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI43Max" column="inharm_i_43_max" jdbcType="FLOAT"/>
+            <result property="inharmI43Min" column="inharm_i_43_min" jdbcType="FLOAT"/>
+            <result property="inharmI43Avg" column="inharm_i_43_avg" jdbcType="FLOAT"/>
+            <result property="inharmI43Cp95" column="inharm_i_43_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI44Max" column="inharm_i_44_max" jdbcType="FLOAT"/>
+            <result property="inharmI44Min" column="inharm_i_44_min" jdbcType="FLOAT"/>
+            <result property="inharmI44Avg" column="inharm_i_44_avg" jdbcType="FLOAT"/>
+            <result property="inharmI44Cp95" column="inharm_i_44_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI45Max" column="inharm_i_45_max" jdbcType="FLOAT"/>
+            <result property="inharmI45Min" column="inharm_i_45_min" jdbcType="FLOAT"/>
+            <result property="inharmI45Avg" column="inharm_i_45_avg" jdbcType="FLOAT"/>
+            <result property="inharmI45Cp95" column="inharm_i_45_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI46Max" column="inharm_i_46_max" jdbcType="FLOAT"/>
+            <result property="inharmI46Min" column="inharm_i_46_min" jdbcType="FLOAT"/>
+            <result property="inharmI46Avg" column="inharm_i_46_avg" jdbcType="FLOAT"/>
+            <result property="inharmI46Cp95" column="inharm_i_46_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI47Max" column="inharm_i_47_max" jdbcType="FLOAT"/>
+            <result property="inharmI47Min" column="inharm_i_47_min" jdbcType="FLOAT"/>
+            <result property="inharmI47Avg" column="inharm_i_47_avg" jdbcType="FLOAT"/>
+            <result property="inharmI47Cp95" column="inharm_i_47_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI48Max" column="inharm_i_48_max" jdbcType="FLOAT"/>
+            <result property="inharmI48Min" column="inharm_i_48_min" jdbcType="FLOAT"/>
+            <result property="inharmI48Avg" column="inharm_i_48_avg" jdbcType="FLOAT"/>
+            <result property="inharmI48Cp95" column="inharm_i_48_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI49Max" column="inharm_i_49_max" jdbcType="FLOAT"/>
+            <result property="inharmI49Min" column="inharm_i_49_min" jdbcType="FLOAT"/>
+            <result property="inharmI49Avg" column="inharm_i_49_avg" jdbcType="FLOAT"/>
+            <result property="inharmI49Cp95" column="inharm_i_49_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI50Max" column="inharm_i_50_max" jdbcType="FLOAT"/>
+            <result property="inharmI50Min" column="inharm_i_50_min" jdbcType="FLOAT"/>
+            <result property="inharmI50Avg" column="inharm_i_50_avg" jdbcType="FLOAT"/>
+            <result property="inharmI50Cp95" column="inharm_i_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        inharm_i_2_max,inharm_i_2_min,inharm_i_2_avg,
+        inharm_i_2_cp95,inharm_i_3_max,inharm_i_3_min,
+        inharm_i_3_avg,inharm_i_3_cp95,inharm_i_4_max,
+        inharm_i_4_min,inharm_i_4_avg,inharm_i_4_cp95,
+        inharm_i_5_max,inharm_i_5_min,inharm_i_5_avg,
+        inharm_i_5_cp95,inharm_i_6_max,inharm_i_6_min,
+        inharm_i_6_avg,inharm_i_6_cp95,inharm_i_7_max,
+        inharm_i_7_min,inharm_i_7_avg,inharm_i_7_cp95,
+        inharm_i_8_max,inharm_i_8_min,inharm_i_8_avg,
+        inharm_i_8_cp95,inharm_i_9_max,inharm_i_9_min,
+        inharm_i_9_avg,inharm_i_9_cp95,inharm_i_10_max,
+        inharm_i_10_min,inharm_i_10_avg,inharm_i_10_cp95,
+        inharm_i_11_max,inharm_i_11_min,inharm_i_11_avg,
+        inharm_i_11_cp95,inharm_i_12_max,inharm_i_12_min,
+        inharm_i_12_avg,inharm_i_12_cp95,inharm_i_13_max,
+        inharm_i_13_min,inharm_i_13_avg,inharm_i_13_cp95,
+        inharm_i_14_max,inharm_i_14_min,inharm_i_14_avg,
+        inharm_i_14_cp95,inharm_i_15_max,inharm_i_15_min,
+        inharm_i_15_avg,inharm_i_15_cp95,inharm_i_16_max,
+        inharm_i_16_min,inharm_i_16_avg,inharm_i_16_cp95,
+        inharm_i_17_max,inharm_i_17_min,inharm_i_17_avg,
+        inharm_i_17_cp95,inharm_i_18_max,inharm_i_18_min,
+        inharm_i_18_avg,inharm_i_18_cp95,inharm_i_19_max,
+        inharm_i_19_min,inharm_i_19_avg,inharm_i_19_cp95,
+        inharm_i_20_max,inharm_i_20_min,inharm_i_20_avg,
+        inharm_i_20_cp95,inharm_i_21_max,inharm_i_21_min,
+        inharm_i_21_avg,inharm_i_21_cp95,inharm_i_22_max,
+        inharm_i_22_min,inharm_i_22_avg,inharm_i_22_cp95,
+        inharm_i_23_max,inharm_i_23_min,inharm_i_23_avg,
+        inharm_i_23_cp95,inharm_i_24_max,inharm_i_24_min,
+        inharm_i_24_avg,inharm_i_24_cp95,inharm_i_25_max,
+        inharm_i_25_min,inharm_i_25_avg,inharm_i_25_cp95,
+        inharm_i_26_max,inharm_i_26_min,inharm_i_26_avg,
+        inharm_i_26_cp95,inharm_i_27_max,inharm_i_27_min,
+        inharm_i_27_avg,inharm_i_27_cp95,inharm_i_28_max,
+        inharm_i_28_min,inharm_i_28_avg,inharm_i_28_cp95,
+        inharm_i_29_max,inharm_i_29_min,inharm_i_29_avg,
+        inharm_i_29_cp95,inharm_i_30_max,inharm_i_30_min,
+        inharm_i_30_avg,inharm_i_30_cp95,inharm_i_31_max,
+        inharm_i_31_min,inharm_i_31_avg,inharm_i_31_cp95,
+        inharm_i_32_max,inharm_i_32_min,inharm_i_32_avg,
+        inharm_i_32_cp95,inharm_i_33_max,inharm_i_33_min,
+        inharm_i_33_avg,inharm_i_33_cp95,inharm_i_34_max,
+        inharm_i_34_min,inharm_i_34_avg,inharm_i_34_cp95,
+        inharm_i_35_max,inharm_i_35_min,inharm_i_35_avg,
+        inharm_i_35_cp95,inharm_i_36_max,inharm_i_36_min,
+        inharm_i_36_avg,inharm_i_36_cp95,inharm_i_37_max,
+        inharm_i_37_min,inharm_i_37_avg,inharm_i_37_cp95,
+        inharm_i_38_max,inharm_i_38_min,inharm_i_38_avg,
+        inharm_i_38_cp95,inharm_i_39_max,inharm_i_39_min,
+        inharm_i_39_avg,inharm_i_39_cp95,inharm_i_40_max,
+        inharm_i_40_min,inharm_i_40_avg,inharm_i_40_cp95,
+        inharm_i_41_max,inharm_i_41_min,inharm_i_41_avg,
+        inharm_i_41_cp95,inharm_i_42_max,inharm_i_42_min,
+        inharm_i_42_avg,inharm_i_42_cp95,inharm_i_43_max,
+        inharm_i_43_min,inharm_i_43_avg,inharm_i_43_cp95,
+        inharm_i_44_max,inharm_i_44_min,inharm_i_44_avg,
+        inharm_i_44_cp95,inharm_i_45_max,inharm_i_45_min,
+        inharm_i_45_avg,inharm_i_45_cp95,inharm_i_46_max,
+        inharm_i_46_min,inharm_i_46_avg,inharm_i_46_cp95,
+        inharm_i_47_max,inharm_i_47_min,inharm_i_47_avg,
+        inharm_i_47_cp95,inharm_i_48_max,inharm_i_48_min,
+        inharm_i_48_avg,inharm_i_48_cp95,inharm_i_49_max,
+        inharm_i_49_min,inharm_i_49_avg,inharm_i_49_cp95,
+        inharm_i_50_max,inharm_i_50_min,inharm_i_50_avg,
+        inharm_i_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_inharmonic_i_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,298 @@
+<?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.RMpInharmonicVRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="inharmV1Max" column="inharm_v_1_max" jdbcType="FLOAT"/>
+            <result property="inharmV1Min" column="inharm_v_1_min" jdbcType="FLOAT"/>
+            <result property="inharmV1Avg" column="inharm_v_1_avg" jdbcType="FLOAT"/>
+            <result property="inharmV1Cp95" column="inharm_v_1_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV2Max" column="inharm_v_2_max" jdbcType="FLOAT"/>
+            <result property="inharmV2Min" column="inharm_v_2_min" jdbcType="FLOAT"/>
+            <result property="inharmV2Avg" column="inharm_v_2_avg" jdbcType="FLOAT"/>
+            <result property="inharmV2Cp95" column="inharm_v_2_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV3Max" column="inharm_v_3_max" jdbcType="FLOAT"/>
+            <result property="inharmV3Min" column="inharm_v_3_min" jdbcType="FLOAT"/>
+            <result property="inharmV3Avg" column="inharm_v_3_avg" jdbcType="FLOAT"/>
+            <result property="inharmV3Cp95" column="inharm_v_3_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV4Max" column="inharm_v_4_max" jdbcType="FLOAT"/>
+            <result property="inharmV4Min" column="inharm_v_4_min" jdbcType="FLOAT"/>
+            <result property="inharmV4Avg" column="inharm_v_4_avg" jdbcType="FLOAT"/>
+            <result property="inharmV4Cp95" column="inharm_v_4_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV5Max" column="inharm_v_5_max" jdbcType="FLOAT"/>
+            <result property="inharmV5Min" column="inharm_v_5_min" jdbcType="FLOAT"/>
+            <result property="inharmV5Avg" column="inharm_v_5_avg" jdbcType="FLOAT"/>
+            <result property="inharmV5Cp95" column="inharm_v_5_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV6Max" column="inharm_v_6_max" jdbcType="FLOAT"/>
+            <result property="inharmV6Min" column="inharm_v_6_min" jdbcType="FLOAT"/>
+            <result property="inharmV6Avg" column="inharm_v_6_avg" jdbcType="FLOAT"/>
+            <result property="inharmV6Cp95" column="inharm_v_6_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV7Max" column="inharm_v_7_max" jdbcType="FLOAT"/>
+            <result property="inharmV7Min" column="inharm_v_7_min" jdbcType="FLOAT"/>
+            <result property="inharmV7Avg" column="inharm_v_7_avg" jdbcType="FLOAT"/>
+            <result property="inharmV7Cp95" column="inharm_v_7_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV8Max" column="inharm_v_8_max" jdbcType="FLOAT"/>
+            <result property="inharmV8Min" column="inharm_v_8_min" jdbcType="FLOAT"/>
+            <result property="inharmV8Avg" column="inharm_v_8_avg" jdbcType="FLOAT"/>
+            <result property="inharmV8Cp95" column="inharm_v_8_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV9Max" column="inharm_v_9_max" jdbcType="FLOAT"/>
+            <result property="inharmV9Min" column="inharm_v_9_min" jdbcType="FLOAT"/>
+            <result property="inharmV9Avg" column="inharm_v_9_avg" jdbcType="FLOAT"/>
+            <result property="inharmV9Cp95" column="inharm_v_9_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV10Max" column="inharm_v_10_max" jdbcType="FLOAT"/>
+            <result property="inharmV10Min" column="inharm_v_10_min" jdbcType="FLOAT"/>
+            <result property="inharmV10Avg" column="inharm_v_10_avg" jdbcType="FLOAT"/>
+            <result property="inharmV10Cp95" column="inharm_v_10_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV11Max" column="inharm_v_11_max" jdbcType="FLOAT"/>
+            <result property="inharmV11Min" column="inharm_v_11_min" jdbcType="FLOAT"/>
+            <result property="inharmV11Avg" column="inharm_v_11_avg" jdbcType="FLOAT"/>
+            <result property="inharmV11Cp95" column="inharm_v_11_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV12Max" column="inharm_v_12_max" jdbcType="FLOAT"/>
+            <result property="inharmV12Min" column="inharm_v_12_min" jdbcType="FLOAT"/>
+            <result property="inharmV12Avg" column="inharm_v_12_avg" jdbcType="FLOAT"/>
+            <result property="inharmV12Cp95" column="inharm_v_12_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV13Max" column="inharm_v_13_max" jdbcType="FLOAT"/>
+            <result property="inharmV13Min" column="inharm_v_13_min" jdbcType="FLOAT"/>
+            <result property="inharmV13Avg" column="inharm_v_13_avg" jdbcType="FLOAT"/>
+            <result property="inharmV13Cp95" column="inharm_v_13_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV14Max" column="inharm_v_14_max" jdbcType="FLOAT"/>
+            <result property="inharmV14Min" column="inharm_v_14_min" jdbcType="FLOAT"/>
+            <result property="inharmV14Avg" column="inharm_v_14_avg" jdbcType="FLOAT"/>
+            <result property="inharmV14Cp95" column="inharm_v_14_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV15Max" column="inharm_v_15_max" jdbcType="FLOAT"/>
+            <result property="inharmV15Min" column="inharm_v_15_min" jdbcType="FLOAT"/>
+            <result property="inharmV15Avg" column="inharm_v_15_avg" jdbcType="FLOAT"/>
+            <result property="inharmV15Cp95" column="inharm_v_15_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV16Max" column="inharm_v_16_max" jdbcType="FLOAT"/>
+            <result property="inharmV16Min" column="inharm_v_16_min" jdbcType="FLOAT"/>
+            <result property="inharmV16Avg" column="inharm_v_16_avg" jdbcType="FLOAT"/>
+            <result property="inharmV16Cp95" column="inharm_v_16_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV17Max" column="inharm_v_17_max" jdbcType="FLOAT"/>
+            <result property="inharmV17Min" column="inharm_v_17_min" jdbcType="FLOAT"/>
+            <result property="inharmV17Avg" column="inharm_v_17_avg" jdbcType="FLOAT"/>
+            <result property="inharmV17Cp95" column="inharm_v_17_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV18Max" column="inharm_v_18_max" jdbcType="FLOAT"/>
+            <result property="inharmV18Min" column="inharm_v_18_min" jdbcType="FLOAT"/>
+            <result property="inharmV18Avg" column="inharm_v_18_avg" jdbcType="FLOAT"/>
+            <result property="inharmV18Cp95" column="inharm_v_18_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV19Max" column="inharm_v_19_max" jdbcType="FLOAT"/>
+            <result property="inharmV19Min" column="inharm_v_19_min" jdbcType="FLOAT"/>
+            <result property="inharmV19Avg" column="inharm_v_19_avg" jdbcType="FLOAT"/>
+            <result property="inharmV19Cp95" column="inharm_v_19_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV20Max" column="inharm_v_20_max" jdbcType="FLOAT"/>
+            <result property="inharmV20Min" column="inharm_v_20_min" jdbcType="FLOAT"/>
+            <result property="inharmV20Avg" column="inharm_v_20_avg" jdbcType="FLOAT"/>
+            <result property="inharmV20Cp95" column="inharm_v_20_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV21Max" column="inharm_v_21_max" jdbcType="FLOAT"/>
+            <result property="inharmV21Min" column="inharm_v_21_min" jdbcType="FLOAT"/>
+            <result property="inharmV21Avg" column="inharm_v_21_avg" jdbcType="FLOAT"/>
+            <result property="inharmV21Cp95" column="inharm_v_21_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV22Max" column="inharm_v_22_max" jdbcType="FLOAT"/>
+            <result property="inharmV22Min" column="inharm_v_22_min" jdbcType="FLOAT"/>
+            <result property="inharmV22Avg" column="inharm_v_22_avg" jdbcType="FLOAT"/>
+            <result property="inharmV22Cp95" column="inharm_v_22_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV23Max" column="inharm_v_23_max" jdbcType="FLOAT"/>
+            <result property="inharmV23Min" column="inharm_v_23_min" jdbcType="FLOAT"/>
+            <result property="inharmV23Avg" column="inharm_v_23_avg" jdbcType="FLOAT"/>
+            <result property="inharmV23Cp95" column="inharm_v_23_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV24Max" column="inharm_v_24_max" jdbcType="FLOAT"/>
+            <result property="inharmV24Min" column="inharm_v_24_min" jdbcType="FLOAT"/>
+            <result property="inharmV24Avg" column="inharm_v_24_avg" jdbcType="FLOAT"/>
+            <result property="inharmV24Cp95" column="inharm_v_24_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV25Max" column="inharm_v_25_max" jdbcType="FLOAT"/>
+            <result property="inharmV25Min" column="inharm_v_25_min" jdbcType="FLOAT"/>
+            <result property="inharmV25Avg" column="inharm_v_25_avg" jdbcType="FLOAT"/>
+            <result property="inharmV25Cp95" column="inharm_v_25_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV26Max" column="inharm_v_26_max" jdbcType="FLOAT"/>
+            <result property="inharmV26Min" column="inharm_v_26_min" jdbcType="FLOAT"/>
+            <result property="inharmV26Avg" column="inharm_v_26_avg" jdbcType="FLOAT"/>
+            <result property="inharmV26Cp95" column="inharm_v_26_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV27Max" column="inharm_v_27_max" jdbcType="FLOAT"/>
+            <result property="inharmV27Min" column="inharm_v_27_min" jdbcType="FLOAT"/>
+            <result property="inharmV27Avg" column="inharm_v_27_avg" jdbcType="FLOAT"/>
+            <result property="inharmV27Cp95" column="inharm_v_27_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV28Max" column="inharm_v_28_max" jdbcType="FLOAT"/>
+            <result property="inharmV28Min" column="inharm_v_28_min" jdbcType="FLOAT"/>
+            <result property="inharmV28Avg" column="inharm_v_28_avg" jdbcType="FLOAT"/>
+            <result property="inharmV28Cp95" column="inharm_v_28_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV29Max" column="inharm_v_29_max" jdbcType="FLOAT"/>
+            <result property="inharmV29Min" column="inharm_v_29_min" jdbcType="FLOAT"/>
+            <result property="inharmV29Avg" column="inharm_v_29_avg" jdbcType="FLOAT"/>
+            <result property="inharmV29Cp95" column="inharm_v_29_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV30Max" column="inharm_v_30_max" jdbcType="FLOAT"/>
+            <result property="inharmV30Min" column="inharm_v_30_min" jdbcType="FLOAT"/>
+            <result property="inharmV30Avg" column="inharm_v_30_avg" jdbcType="FLOAT"/>
+            <result property="inharmV30Cp95" column="inharm_v_30_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV31Max" column="inharm_v_31_max" jdbcType="FLOAT"/>
+            <result property="inharmV31Min" column="inharm_v_31_min" jdbcType="FLOAT"/>
+            <result property="inharmV31Avg" column="inharm_v_31_avg" jdbcType="FLOAT"/>
+            <result property="inharmV31Cp95" column="inharm_v_31_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV32Max" column="inharm_v_32_max" jdbcType="FLOAT"/>
+            <result property="inharmV32Min" column="inharm_v_32_min" jdbcType="FLOAT"/>
+            <result property="inharmV32Avg" column="inharm_v_32_avg" jdbcType="FLOAT"/>
+            <result property="inharmV32Cp95" column="inharm_v_32_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV33Max" column="inharm_v_33_max" jdbcType="FLOAT"/>
+            <result property="inharmV33Min" column="inharm_v_33_min" jdbcType="FLOAT"/>
+            <result property="inharmV33Avg" column="inharm_v_33_avg" jdbcType="FLOAT"/>
+            <result property="inharmV33Cp95" column="inharm_v_33_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV34Max" column="inharm_v_34_max" jdbcType="FLOAT"/>
+            <result property="inharmV34Min" column="inharm_v_34_min" jdbcType="FLOAT"/>
+            <result property="inharmV34Avg" column="inharm_v_34_avg" jdbcType="FLOAT"/>
+            <result property="inharmV34Cp95" column="inharm_v_34_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV35Max" column="inharm_v_35_max" jdbcType="FLOAT"/>
+            <result property="inharmV35Min" column="inharm_v_35_min" jdbcType="FLOAT"/>
+            <result property="inharmV35Avg" column="inharm_v_35_avg" jdbcType="FLOAT"/>
+            <result property="inharmV35Cp95" column="inharm_v_35_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV36Max" column="inharm_v_36_max" jdbcType="FLOAT"/>
+            <result property="inharmV36Min" column="inharm_v_36_min" jdbcType="FLOAT"/>
+            <result property="inharmV36Avg" column="inharm_v_36_avg" jdbcType="FLOAT"/>
+            <result property="inharmV36Cp95" column="inharm_v_36_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV37Max" column="inharm_v_37_max" jdbcType="FLOAT"/>
+            <result property="inharmV37Min" column="inharm_v_37_min" jdbcType="FLOAT"/>
+            <result property="inharmV37Avg" column="inharm_v_37_avg" jdbcType="FLOAT"/>
+            <result property="inharmV37Cp95" column="inharm_v_37_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV38Max" column="inharm_v_38_max" jdbcType="FLOAT"/>
+            <result property="inharmV38Min" column="inharm_v_38_min" jdbcType="FLOAT"/>
+            <result property="inharmV38Avg" column="inharm_v_38_avg" jdbcType="FLOAT"/>
+            <result property="inharmV38Cp95" column="inharm_v_38_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV39Max" column="inharm_v_39_max" jdbcType="FLOAT"/>
+            <result property="inharmV39Min" column="inharm_v_39_min" jdbcType="FLOAT"/>
+            <result property="inharmV39Avg" column="inharm_v_39_avg" jdbcType="FLOAT"/>
+            <result property="inharmV39Cp95" column="inharm_v_39_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV40Max" column="inharm_v_40_max" jdbcType="FLOAT"/>
+            <result property="inharmV40Min" column="inharm_v_40_min" jdbcType="FLOAT"/>
+            <result property="inharmV40Avg" column="inharm_v_40_avg" jdbcType="FLOAT"/>
+            <result property="inharmV40Cp95" column="inharm_v_40_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV41Max" column="inharm_v_41_max" jdbcType="FLOAT"/>
+            <result property="inharmV41Min" column="inharm_v_41_min" jdbcType="FLOAT"/>
+            <result property="inharmV41Avg" column="inharm_v_41_avg" jdbcType="FLOAT"/>
+            <result property="inharmV41Cp95" column="inharm_v_41_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV42Max" column="inharm_v_42_max" jdbcType="FLOAT"/>
+            <result property="inharmV42Min" column="inharm_v_42_min" jdbcType="FLOAT"/>
+            <result property="inharmV42Avg" column="inharm_v_42_avg" jdbcType="FLOAT"/>
+            <result property="inharmV42Cp95" column="inharm_v_42_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV43Max" column="inharm_v_43_max" jdbcType="FLOAT"/>
+            <result property="inharmV43Min" column="inharm_v_43_min" jdbcType="FLOAT"/>
+            <result property="inharmV43Avg" column="inharm_v_43_avg" jdbcType="FLOAT"/>
+            <result property="inharmV43Cp95" column="inharm_v_43_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV44Max" column="inharm_v_44_max" jdbcType="FLOAT"/>
+            <result property="inharmV44Min" column="inharm_v_44_min" jdbcType="FLOAT"/>
+            <result property="inharmV44Avg" column="inharm_v_44_avg" jdbcType="FLOAT"/>
+            <result property="inharmV44Cp95" column="inharm_v_44_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV45Max" column="inharm_v_45_max" jdbcType="FLOAT"/>
+            <result property="inharmV45Min" column="inharm_v_45_min" jdbcType="FLOAT"/>
+            <result property="inharmV45Avg" column="inharm_v_45_avg" jdbcType="FLOAT"/>
+            <result property="inharmV45Cp95" column="inharm_v_45_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV46Max" column="inharm_v_46_max" jdbcType="FLOAT"/>
+            <result property="inharmV46Min" column="inharm_v_46_min" jdbcType="FLOAT"/>
+            <result property="inharmV46Avg" column="inharm_v_46_avg" jdbcType="FLOAT"/>
+            <result property="inharmV46Cp95" column="inharm_v_46_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV47Max" column="inharm_v_47_max" jdbcType="FLOAT"/>
+            <result property="inharmV47Min" column="inharm_v_47_min" jdbcType="FLOAT"/>
+            <result property="inharmV47Avg" column="inharm_v_47_avg" jdbcType="FLOAT"/>
+            <result property="inharmV47Cp95" column="inharm_v_47_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV48Max" column="inharm_v_48_max" jdbcType="FLOAT"/>
+            <result property="inharmV48Min" column="inharm_v_48_min" jdbcType="FLOAT"/>
+            <result property="inharmV48Avg" column="inharm_v_48_avg" jdbcType="FLOAT"/>
+            <result property="inharmV48Cp95" column="inharm_v_48_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV49Max" column="inharm_v_49_max" jdbcType="FLOAT"/>
+            <result property="inharmV49Min" column="inharm_v_49_min" jdbcType="FLOAT"/>
+            <result property="inharmV49Avg" column="inharm_v_49_avg" jdbcType="FLOAT"/>
+            <result property="inharmV49Cp95" column="inharm_v_49_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV50Max" column="inharm_v_50_max" jdbcType="FLOAT"/>
+            <result property="inharmV50Min" column="inharm_v_50_min" jdbcType="FLOAT"/>
+            <result property="inharmV50Avg" column="inharm_v_50_avg" jdbcType="FLOAT"/>
+            <result property="inharmV50Cp95" column="inharm_v_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        inharm_v_1_max,inharm_v_1_min,inharm_v_1_avg,
+        inharm_v_1_cp95,inharm_v_2_max,inharm_v_2_min,
+        inharm_v_2_avg,inharm_v_2_cp95,inharm_v_3_max,
+        inharm_v_3_min,inharm_v_3_avg,inharm_v_3_cp95,
+        inharm_v_4_max,inharm_v_4_min,inharm_v_4_avg,
+        inharm_v_4_cp95,inharm_v_5_max,inharm_v_5_min,
+        inharm_v_5_avg,inharm_v_5_cp95,inharm_v_6_max,
+        inharm_v_6_min,inharm_v_6_avg,inharm_v_6_cp95,
+        inharm_v_7_max,inharm_v_7_min,inharm_v_7_avg,
+        inharm_v_7_cp95,inharm_v_8_max,inharm_v_8_min,
+        inharm_v_8_avg,inharm_v_8_cp95,inharm_v_9_max,
+        inharm_v_9_min,inharm_v_9_avg,inharm_v_9_cp95,
+        inharm_v_10_max,inharm_v_10_min,inharm_v_10_avg,
+        inharm_v_10_cp95,inharm_v_11_max,inharm_v_11_min,
+        inharm_v_11_avg,inharm_v_11_cp95,inharm_v_12_max,
+        inharm_v_12_min,inharm_v_12_avg,inharm_v_12_cp95,
+        inharm_v_13_max,inharm_v_13_min,inharm_v_13_avg,
+        inharm_v_13_cp95,inharm_v_14_max,inharm_v_14_min,
+        inharm_v_14_avg,inharm_v_14_cp95,inharm_v_15_max,
+        inharm_v_15_min,inharm_v_15_avg,inharm_v_15_cp95,
+        inharm_v_16_max,inharm_v_16_min,inharm_v_16_avg,
+        inharm_v_16_cp95,inharm_v_17_max,inharm_v_17_min,
+        inharm_v_17_avg,inharm_v_17_cp95,inharm_v_18_max,
+        inharm_v_18_min,inharm_v_18_avg,inharm_v_18_cp95,
+        inharm_v_19_max,inharm_v_19_min,inharm_v_19_avg,
+        inharm_v_19_cp95,inharm_v_20_max,inharm_v_20_min,
+        inharm_v_20_avg,inharm_v_20_cp95,inharm_v_21_max,
+        inharm_v_21_min,inharm_v_21_avg,inharm_v_21_cp95,
+        inharm_v_22_max,inharm_v_22_min,inharm_v_22_avg,
+        inharm_v_22_cp95,inharm_v_23_max,inharm_v_23_min,
+        inharm_v_23_avg,inharm_v_23_cp95,inharm_v_24_max,
+        inharm_v_24_min,inharm_v_24_avg,inharm_v_24_cp95,
+        inharm_v_25_max,inharm_v_25_min,inharm_v_25_avg,
+        inharm_v_25_cp95,inharm_v_26_max,inharm_v_26_min,
+        inharm_v_26_avg,inharm_v_26_cp95,inharm_v_27_max,
+        inharm_v_27_min,inharm_v_27_avg,inharm_v_27_cp95,
+        inharm_v_28_max,inharm_v_28_min,inharm_v_28_avg,
+        inharm_v_28_cp95,inharm_v_29_max,inharm_v_29_min,
+        inharm_v_29_avg,inharm_v_29_cp95,inharm_v_30_max,
+        inharm_v_30_min,inharm_v_30_avg,inharm_v_30_cp95,
+        inharm_v_31_max,inharm_v_31_min,inharm_v_31_avg,
+        inharm_v_31_cp95,inharm_v_32_max,inharm_v_32_min,
+        inharm_v_32_avg,inharm_v_32_cp95,inharm_v_33_max,
+        inharm_v_33_min,inharm_v_33_avg,inharm_v_33_cp95,
+        inharm_v_34_max,inharm_v_34_min,inharm_v_34_avg,
+        inharm_v_34_cp95,inharm_v_35_max,inharm_v_35_min,
+        inharm_v_35_avg,inharm_v_35_cp95,inharm_v_36_max,
+        inharm_v_36_min,inharm_v_36_avg,inharm_v_36_cp95,
+        inharm_v_37_max,inharm_v_37_min,inharm_v_37_avg,
+        inharm_v_37_cp95,inharm_v_38_max,inharm_v_38_min,
+        inharm_v_38_avg,inharm_v_38_cp95,inharm_v_39_max,
+        inharm_v_39_min,inharm_v_39_avg,inharm_v_39_cp95,
+        inharm_v_40_max,inharm_v_40_min,inharm_v_40_avg,
+        inharm_v_40_cp95,inharm_v_41_max,inharm_v_41_min,
+        inharm_v_41_avg,inharm_v_41_cp95,inharm_v_42_max,
+        inharm_v_42_min,inharm_v_42_avg,inharm_v_42_cp95,
+        inharm_v_43_max,inharm_v_43_min,inharm_v_43_avg,
+        inharm_v_43_cp95,inharm_v_44_max,inharm_v_44_min,
+        inharm_v_44_avg,inharm_v_44_cp95,inharm_v_45_max,
+        inharm_v_45_min,inharm_v_45_avg,inharm_v_45_cp95,
+        inharm_v_46_max,inharm_v_46_min,inharm_v_46_avg,
+        inharm_v_46_cp95,inharm_v_47_max,inharm_v_47_min,
+        inharm_v_47_avg,inharm_v_47_cp95,inharm_v_48_max,
+        inharm_v_48_min,inharm_v_48_avg,inharm_v_48_cp95,
+        inharm_v_49_max,inharm_v_49_min,inharm_v_49_avg,
+        inharm_v_49_cp95,inharm_v_50_max,inharm_v_50_min,
+        inharm_v_50_avg,inharm_v_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_inharmonic_v_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,85 @@
+<?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.RMpMeasurePhaseReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="phaseVoltageEffectiveMax" column="phase_voltage_effective_max" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffectiveMin" column="phase_voltage_effective_min" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffectiveAvg" column="phase_voltage_effective_avg" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffective95" column="phase_voltage_effective_95" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveMax" column="line_voltage_effective_max" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveMin" column="line_voltage_effective_min" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveAvg" column="line_voltage_effective_avg" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffective95" column="line_voltage_effective_95" jdbcType="FLOAT"/>
+            <result property="vDeUpMax" column="v_de_up_max" jdbcType="FLOAT"/>
+            <result property="vDeUpMin" column="v_de_up_min" jdbcType="FLOAT"/>
+            <result property="vDeUpAvg" column="v_de_up_avg" jdbcType="FLOAT"/>
+            <result property="vDeUp95" column="v_de_up_95" jdbcType="FLOAT"/>
+            <result property="vDeLowMax" column="v_de_low_max" jdbcType="FLOAT"/>
+            <result property="vDeLowMin" column="v_de_low_min" jdbcType="FLOAT"/>
+            <result property="vDeLowAvg" column="v_de_low_avg" jdbcType="FLOAT"/>
+            <result property="vDeLow95" column="v_de_low_95" jdbcType="FLOAT"/>
+            <result property="currentEffectiveMax" column="current_effective_max" jdbcType="FLOAT"/>
+            <result property="currentEffectiveMin" column="current_effective_min" jdbcType="FLOAT"/>
+            <result property="currentEffectiveAvg" column="current_effective_avg" jdbcType="FLOAT"/>
+            <result property="currentEffective95" column="current_effective_95" jdbcType="FLOAT"/>
+            <result property="spActivePowerMax" column="sp_active_power_max" jdbcType="FLOAT"/>
+            <result property="spActivePowerMin" column="sp_active_power_min" jdbcType="FLOAT"/>
+            <result property="spActivePowerAvg" column="sp_active_power_avg" jdbcType="FLOAT"/>
+            <result property="spActivePower95" column="sp_active_power_95" jdbcType="FLOAT"/>
+            <result property="spReactivePowerMax" column="sp_reactive_power_max" jdbcType="FLOAT"/>
+            <result property="spReactivePowerMin" column="sp_reactive_power_min" jdbcType="FLOAT"/>
+            <result property="spReactivePowerAvg" column="sp_reactive_power_avg" jdbcType="FLOAT"/>
+            <result property="spReactivePower95" column="sp_reactive_power_95" jdbcType="FLOAT"/>
+            <result property="spApparentPowerMax" column="sp_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="spApparentPowerMin" column="sp_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="spApparentPowerAvg" column="sp_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="spApparentPower95" column="sp_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="spPowerFactorMax" column="sp_power_factor_max" jdbcType="FLOAT"/>
+            <result property="spPowerFactorMin" column="sp_power_factor_min" jdbcType="FLOAT"/>
+            <result property="spPowerFactorAvg" column="sp_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="spPowerFactor95" column="sp_power_factor_95" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorMax" column="sp_fundamental_power_factor_max" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorMin" column="sp_fundamental_power_factor_min" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorAvg" column="sp_fundamental_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactor95" column="sp_fundamental_power_factor_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        phase_voltage_effective_max,phase_voltage_effective_min,phase_voltage_effective_avg,
+        phase_voltage_effective_95,line_voltage_effective_max,line_voltage_effective_min,
+        line_voltage_effective_avg,line_voltage_effective_95,v_de_up_max,
+        v_de_up_min,v_de_up_avg,v_de_up_95,
+        v_de_low_max,v_de_low_min,v_de_low_avg,
+        v_de_low_95,current_effective_max,current_effective_min,
+        current_effective_avg,current_effective_95,sp_active_power_max,
+        sp_active_power_min,sp_active_power_avg,sp_active_power_95,
+        sp_reactive_power_max,sp_reactive_power_min,sp_reactive_power_avg,
+        sp_reactive_power_95,sp_apparent_power_max,sp_apparent_power_min,
+        sp_apparent_power_avg,sp_apparent_power_95,sp_power_factor_max,
+        sp_power_factor_min,sp_power_factor_avg,sp_power_factor_95,
+        sp_fundamental_power_factor_max,sp_fundamental_power_factor_min,sp_fundamental_power_factor_avg,
+        sp_fundamental_power_factor_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_measure_phase_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,153 @@
+<?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.RMpMeasureReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpMeasureReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="frequencyMax" column="frequency_max" jdbcType="FLOAT"/>
+            <result property="frequencyMin" column="frequency_min" jdbcType="FLOAT"/>
+            <result property="frequencyAvg" column="frequency_avg" jdbcType="FLOAT"/>
+            <result property="frequency95" column="frequency_95" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationMax" column="frequency_deviation_max" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationMin" column="frequency_deviation_min" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationAvg" column="frequency_deviation_avg" jdbcType="FLOAT"/>
+            <result property="frequencyDeviation95" column="frequency_deviation_95" jdbcType="FLOAT"/>
+            <result property="totalActivePowerMax" column="total_active_power_max" jdbcType="FLOAT"/>
+            <result property="totalActivePowerMin" column="total_active_power_min" jdbcType="FLOAT"/>
+            <result property="totalActivePowerAvg" column="total_active_power_avg" jdbcType="FLOAT"/>
+            <result property="totalActivePower95" column="total_active_power_95" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerMax" column="total_reactive_power_max" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerMin" column="total_reactive_power_min" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerAvg" column="total_reactive_power_avg" jdbcType="FLOAT"/>
+            <result property="totalReactivePower95" column="total_reactive_power_95" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerMax" column="total_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerMin" column="total_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerAvg" column="total_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="totalApparentPower95" column="total_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorMax" column="tp_power_factor_max" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorMin" column="tp_power_factor_min" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorAvg" column="tp_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="tpPowerFactor95" column="tp_power_factor_95" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorMax" column="fundamental_power_factor_max" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorMin" column="fundamental_power_factor_min" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorAvg" column="fundamental_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactor95" column="fundamental_power_factor_95" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageMax" column="positive_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageMin" column="positive_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageAvg" column="positive_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltage95" column="positive_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageMax" column="negative_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageMin" column="negative_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageAvg" column="negative_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltage95" column="negative_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageMax" column="zero_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageMin" column="zero_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageAvg" column="zero_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltage95" column="zero_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceMax" column="negative_sequence_voltage_unbalance_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceMin" column="negative_sequence_voltage_unbalance_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceAvg" column="negative_sequence_voltage_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalance95" column="negative_sequence_voltage_unbalance_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceMax" column="zero_sequence_voltage_unbalance_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceMin" column="zero_sequence_voltage_unbalance_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceAvg" column="zero_sequence_voltage_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalance95" column="zero_sequence_voltage_unbalance_95" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentMax" column="positive_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentMin" column="positive_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentAvg" column="positive_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrent95" column="positive_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentMax" column="negative_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentMin" column="negative_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentAvg" column="negative_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrent95" column="negative_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentMax" column="zero_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentMin" column="zero_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentAvg" column="zero_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrent95" column="zero_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceMax" column="negative_sequence_current_unbalance_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceMin" column="negative_sequence_current_unbalance_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceAvg" column="negative_sequence_current_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalance95" column="negative_sequence_current_unbalance_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceMax" column="zero_sequence_current_imbalance_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceMin" column="zero_sequence_current_imbalance_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceAvg" column="zero_sequence_current_imbalance_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalance95" column="zero_sequence_current_imbalance_95" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerMax" column="equivalent_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerMin" column="equivalent_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerAvg" column="equivalent_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPower95" column="equivalent_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorMax" column="equivalent_power_factor_max" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorMin" column="equivalent_power_factor_min" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorAvg" column="equivalent_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactor95" column="equivalent_power_factor_95" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoMax" column="fundamental_wave_rateo_max" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoMin" column="fundamental_wave_rateo_min" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoAvg" column="fundamental_wave_rateo_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateo95" column="fundamental_wave_rateo_95" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentMax" column="fundamental_wave_apparent_max" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentMin" column="fundamental_wave_apparent_min" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentAvg" column="fundamental_wave_apparent_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparent95" column="fundamental_wave_apparent_95" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoMax" column="nonfundamental_wave_rateo_max" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoMin" column="nonfundamental_wave_rateo_min" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoAvg" column="nonfundamental_wave_rateo_avg" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateo95" column="nonfundamental_wave_rateo_95" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerMax" column="unbalanced_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerMin" column="unbalanced_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerAvg" column="unbalanced_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPower95" column="unbalanced_apparent_power_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,frequency_max,
+        frequency_min,frequency_avg,frequency_95,
+        frequency_deviation_max,frequency_deviation_min,frequency_deviation_avg,
+        frequency_deviation_95,total_active_power_max,total_active_power_min,
+        total_active_power_avg,total_active_power_95,total_reactive_power_max,
+        total_reactive_power_min,total_reactive_power_avg,total_reactive_power_95,
+        total_apparent_power_max,total_apparent_power_min,total_apparent_power_avg,
+        total_apparent_power_95,tp_power_factor_max,tp_power_factor_min,
+        tp_power_factor_avg,tp_power_factor_95,fundamental_power_factor_max,
+        fundamental_power_factor_min,fundamental_power_factor_avg,fundamental_power_factor_95,
+        positive_sequence_voltage_max,positive_sequence_voltage_min,positive_sequence_voltage_avg,
+        positive_sequence_voltage_95,negative_sequence_voltage_max,negative_sequence_voltage_min,
+        negative_sequence_voltage_avg,negative_sequence_voltage_95,zero_sequence_voltage_max,
+        zero_sequence_voltage_min,zero_sequence_voltage_avg,zero_sequence_voltage_95,
+        negative_sequence_voltage_unbalance_max,negative_sequence_voltage_unbalance_min,negative_sequence_voltage_unbalance_avg,
+        negative_sequence_voltage_unbalance_95,zero_sequence_voltage_unbalance_max,zero_sequence_voltage_unbalance_min,
+        zero_sequence_voltage_unbalance_avg,zero_sequence_voltage_unbalance_95,positive_sequence_current_max,
+        positive_sequence_current_min,positive_sequence_current_avg,positive_sequence_current_95,
+        negative_sequence_current_max,negative_sequence_current_min,negative_sequence_current_avg,
+        negative_sequence_current_95,zero_sequence_current_max,zero_sequence_current_min,
+        zero_sequence_current_avg,zero_sequence_current_95,negative_sequence_current_unbalance_max,
+        negative_sequence_current_unbalance_min,negative_sequence_current_unbalance_avg,negative_sequence_current_unbalance_95,
+        zero_sequence_current_imbalance_max,zero_sequence_current_imbalance_min,zero_sequence_current_imbalance_avg,
+        zero_sequence_current_imbalance_95,equivalent_apparent_power_max,equivalent_apparent_power_min,
+        equivalent_apparent_power_avg,equivalent_apparent_power_95,equivalent_power_factor_max,
+        equivalent_power_factor_min,equivalent_power_factor_avg,equivalent_power_factor_95,
+        fundamental_wave_rateo_max,fundamental_wave_rateo_min,fundamental_wave_rateo_avg,
+        fundamental_wave_rateo_95,fundamental_wave_apparent_max,fundamental_wave_apparent_min,
+        fundamental_wave_apparent_avg,fundamental_wave_apparent_95,nonfundamental_wave_rateo_max,
+        nonfundamental_wave_rateo_min,nonfundamental_wave_rateo_avg,nonfundamental_wave_rateo_95,
+        unbalanced_apparent_power_max,unbalanced_apparent_power_min,unbalanced_apparent_power_avg,
+        unbalanced_apparent_power_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpMeasureReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_measure_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>

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

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPartHarmonicDetailDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="is_harmonic" property="isHarmonic" />
+        <result column="is_freq" property="isFreq" />
+        <result column="freq_times" property="freqTimes" />
+        <result column="is_v_dev_up" property="isVDevUp" />
+        <result column="is_v_dev_low" property="isVDevLow" />
+        <result column="is_v_dev" property="isVDev" />
+        <result column="is_v_thd" property="isVThd" />
+        <result column="v_dev_times" property="vDevTimes" />
+        <result column="is_v" property="isV" />
+        <result column="v_times" property="vTimes" />
+        <result column="is_i" property="isI" />
+        <result column="i_times" property="iTimes" />
+        <result column="is_v_2" property="isV2" />
+        <result column="is_v_3" property="isV3" />
+        <result column="is_v_4" property="isV4" />
+        <result column="is_v_5" property="isV5" />
+        <result column="is_v_6" property="isV6" />
+        <result column="is_v_7" property="isV7" />
+        <result column="is_v_8" property="isV8" />
+        <result column="is_v_9" property="isV9" />
+        <result column="is_v_10" property="isV10" />
+        <result column="is_v_11" property="isV11" />
+        <result column="is_v_12" property="isV12" />
+        <result column="is_v_13" property="isV13" />
+        <result column="is_v_14" property="isV14" />
+        <result column="is_v_15" property="isV15" />
+        <result column="is_v_16" property="isV16" />
+        <result column="is_v_17" property="isV17" />
+        <result column="is_v_18" property="isV18" />
+        <result column="is_v_19" property="isV19" />
+        <result column="is_v_20" property="isV20" />
+        <result column="is_v_21" property="isV21" />
+        <result column="is_v_22" property="isV22" />
+        <result column="is_v_23" property="isV23" />
+        <result column="is_v_24" property="isV24" />
+        <result column="is_v_25" property="isV25" />
+        <result column="is_v_26" property="isV26" />
+        <result column="is_v_27" property="isV27" />
+        <result column="is_v_28" property="isV28" />
+        <result column="is_v_29" property="isV29" />
+        <result column="is_v_30" property="isV30" />
+        <result column="is_v_31" property="isV31" />
+        <result column="is_v_32" property="isV32" />
+        <result column="is_v_33" property="isV33" />
+        <result column="is_v_34" property="isV34" />
+        <result column="is_v_35" property="isV35" />
+        <result column="is_v_36" property="isV36" />
+        <result column="is_v_37" property="isV37" />
+        <result column="is_v_38" property="isV38" />
+        <result column="is_v_39" property="isV39" />
+        <result column="is_v_40" property="isV40" />
+        <result column="is_v_41" property="isV41" />
+        <result column="is_v_42" property="isV42" />
+        <result column="is_v_43" property="isV43" />
+        <result column="is_v_44" property="isV44" />
+        <result column="is_v_45" property="isV45" />
+        <result column="is_v_46" property="isV46" />
+        <result column="is_v_47" property="isV47" />
+        <result column="is_v_48" property="isV48" />
+        <result column="is_v_49" property="isV49" />
+        <result column="is_v_50" property="isV50" />
+        <result column="is_i_2" property="isI2" />
+        <result column="is_i_3" property="isI3" />
+        <result column="is_i_4" property="isI4" />
+        <result column="is_i_5" property="isI5" />
+        <result column="is_i_6" property="isI6" />
+        <result column="is_i_7" property="isI7" />
+        <result column="is_i_8" property="isI8" />
+        <result column="is_i_9" property="isI9" />
+        <result column="is_i_10" property="isI10" />
+        <result column="is_i_11" property="isI11" />
+        <result column="is_i_12" property="isI12" />
+        <result column="is_i_13" property="isI13" />
+        <result column="is_i_14" property="isI14" />
+        <result column="is_i_15" property="isI15" />
+        <result column="is_i_16" property="isI16" />
+        <result column="is_i_17" property="isI17" />
+        <result column="is_i_18" property="isI18" />
+        <result column="is_i_19" property="isI19" />
+        <result column="is_i_20" property="isI20" />
+        <result column="is_i_21" property="isI21" />
+        <result column="is_i_22" property="isI22" />
+        <result column="is_i_23" property="isI23" />
+        <result column="is_i_24" property="isI24" />
+        <result column="is_i_25" property="isI25" />
+        <result column="is_i_26" property="isI26" />
+        <result column="is_i_27" property="isI27" />
+        <result column="is_i_28" property="isI28" />
+        <result column="is_i_29" property="isI29" />
+        <result column="is_i_30" property="isI30" />
+        <result column="is_i_31" property="isI31" />
+        <result column="is_i_32" property="isI32" />
+        <result column="is_i_33" property="isI33" />
+        <result column="is_i_34" property="isI34" />
+        <result column="is_i_35" property="isI35" />
+        <result column="is_i_36" property="isI36" />
+        <result column="is_i_37" property="isI37" />
+        <result column="is_i_38" property="isI38" />
+        <result column="is_i_39" property="isI39" />
+        <result column="is_i_40" property="isI40" />
+        <result column="is_i_41" property="isI41" />
+        <result column="is_i_42" property="isI42" />
+        <result column="is_i_43" property="isI43" />
+        <result column="is_i_44" property="isI44" />
+        <result column="is_i_45" property="isI45" />
+        <result column="is_i_46" property="isI46" />
+        <result column="is_i_47" property="isI47" />
+        <result column="is_i_48" property="isI48" />
+        <result column="is_i_49" property="isI49" />
+        <result column="is_i_50" property="isI50" />
+        <result column="is_unbalance" property="isUnbalance" />
+        <result column="is_i_neg" property="isINeg" />
+        <result column="unbalance_times" property="unbalanceTimes" />
+        <result column="i_neg_times" property="iNegTimes" />
+    </resultMap>
+    <select id="getRMpPartHarmonicDetailIcon"
+            resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO">
+        SELECT
+            rmphd.data_date,
+            rmphd.freq_times,
+            rmphd.v_dev_times,
+            rmphd.v_times,
+            rmphd.i_times,
+            rmphd.unbalance_times,
+            rmphd.i_neg_times,
+            rmshd.flicker_times,
+            rmshd.inuharm_times
+        FROM
+            r_mp_part_harmonic_detail_d rmphd
+            LEFT JOIN r_mp_surplus_harmonic_detail_d rmshd ON rmshd.measurement_point_id = rmphd.measurement_point_id
+            AND rmshd.data_date = rmphd.data_date
+        <where>
+            <if test="param != null and  param.id">
+                AND  rmphd.measurement_point_id = #{param.id}
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rmphd.data_date >= #{param.startTime} AND rmshd.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  rmphd.data_date &lt;= #{param.endTime}  AND  rmshd.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+
+    </select>
+
+</mapper>

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPartHarmonicDetailMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_over_day" property="measurementOverDay" />
+        <result column="freq_over_day" property="freqOverDay" />
+        <result column="v_dev_up_over_day" property="vDevUpOverDay" />
+        <result column="v_dev_low_over_day" property="vDevLowOverDay" />
+        <result column="v_dev_over_day" property="vDevOverDay" />
+        <result column="v_thd_over_day" property="vThdOverDay" />
+        <result column="v_over_day" property="vOverDay" />
+        <result column="i_over_day" property="iOverDay" />
+        <result column="v_2_over_day" property="v2OverDay" />
+        <result column="v_3_over_day" property="v3OverDay" />
+        <result column="v_4_over_day" property="v4OverDay" />
+        <result column="v_5_over_day" property="v5OverDay" />
+        <result column="v_6_over_day" property="v6OverDay" />
+        <result column="v_7_over_day" property="v7OverDay" />
+        <result column="v_8_over_day" property="v8OverDay" />
+        <result column="v_9_over_day" property="v9OverDay" />
+        <result column="v_10_over_day" property="v10OverDay" />
+        <result column="v_11_over_day" property="v11OverDay" />
+        <result column="v_12_over_day" property="v12OverDay" />
+        <result column="v_13_over_day" property="v13OverDay" />
+        <result column="v_14_over_day" property="v14OverDay" />
+        <result column="v_15_over_day" property="v15OverDay" />
+        <result column="v_16_over_day" property="v16OverDay" />
+        <result column="v_17_over_day" property="v17OverDay" />
+        <result column="v_18_over_day" property="v18OverDay" />
+        <result column="v_19_over_day" property="v19OverDay" />
+        <result column="v_20_over_day" property="v20OverDay" />
+        <result column="v_21_over_day" property="v21OverDay" />
+        <result column="v_22_over_day" property="v22OverDay" />
+        <result column="v_23_over_day" property="v23OverDay" />
+        <result column="v_24_over_day" property="v24OverDay" />
+        <result column="v_25_over_day" property="v25OverDay" />
+        <result column="v_26_over_day" property="v26OverDay" />
+        <result column="v_27_over_day" property="v27OverDay" />
+        <result column="v_28_over_day" property="v28OverDay" />
+        <result column="v_29_over_day" property="v29OverDay" />
+        <result column="v_30_over_day" property="v30OverDay" />
+        <result column="v_31_over_day" property="v31OverDay" />
+        <result column="v_32_over_day" property="v32OverDay" />
+        <result column="v_33_over_day" property="v33OverDay" />
+        <result column="v_34_over_day" property="v34OverDay" />
+        <result column="v_35_over_day" property="v35OverDay" />
+        <result column="v_36_over_day" property="v36OverDay" />
+        <result column="v_37_over_day" property="v37OverDay" />
+        <result column="v_38_over_day" property="v38OverDay" />
+        <result column="v_39_over_day" property="v39OverDay" />
+        <result column="v_40_over_day" property="v40OverDay" />
+        <result column="v_41_over_day" property="v41OverDay" />
+        <result column="v_42_over_day" property="v42OverDay" />
+        <result column="v_43_over_day" property="v43OverDay" />
+        <result column="v_44_over_day" property="v44OverDay" />
+        <result column="v_45_over_day" property="v45OverDay" />
+        <result column="v_46_over_day" property="v46OverDay" />
+        <result column="v_47_over_day" property="v47OverDay" />
+        <result column="v_48_over_day" property="v48OverDay" />
+        <result column="v_49_over_day" property="v49OverDay" />
+        <result column="v_50_over_day" property="v50OverDay" />
+        <result column="i_2_over_day" property="i2OverDay" />
+        <result column="i_3_over_day" property="i3OverDay" />
+        <result column="i_4_over_day" property="i4OverDay" />
+        <result column="i_5_over_day" property="i5OverDay" />
+        <result column="i_6_over_day" property="i6OverDay" />
+        <result column="i_7_over_day" property="i7OverDay" />
+        <result column="i_8_over_day" property="i8OverDay" />
+        <result column="i_9_over_day" property="i9OverDay" />
+        <result column="i_10_over_day" property="i10OverDay" />
+        <result column="i_11_over_day" property="i11OverDay" />
+        <result column="i_12_over_day" property="i12OverDay" />
+        <result column="i_13_over_day" property="i13OverDay" />
+        <result column="i_14_over_day" property="i14OverDay" />
+        <result column="i_15_over_day" property="i15OverDay" />
+        <result column="i_16_over_day" property="i16OverDay" />
+        <result column="i_17_over_day" property="i17OverDay" />
+        <result column="i_18_over_day" property="i18OverDay" />
+        <result column="i_19_over_day" property="i19OverDay" />
+        <result column="i_20_over_day" property="i20OverDay" />
+        <result column="i_21_over_day" property="i21OverDay" />
+        <result column="i_22_over_day" property="i22OverDay" />
+        <result column="i_23_over_day" property="i23OverDay" />
+        <result column="i_24_over_day" property="i24OverDay" />
+        <result column="i_25_over_day" property="i25OverDay" />
+        <result column="i_26_over_day" property="i26OverDay" />
+        <result column="i_27_over_day" property="i27OverDay" />
+        <result column="i_28_over_day" property="i28OverDay" />
+        <result column="i_29_over_day" property="i29OverDay" />
+        <result column="i_30_over_day" property="i30OverDay" />
+        <result column="i_31_over_day" property="i31OverDay" />
+        <result column="i_32_over_day" property="i32OverDay" />
+        <result column="i_33_over_day" property="i33OverDay" />
+        <result column="i_34_over_day" property="i34OverDay" />
+        <result column="i_35_over_day" property="i35OverDay" />
+        <result column="i_36_over_day" property="i36OverDay" />
+        <result column="i_37_over_day" property="i37OverDay" />
+        <result column="i_38_over_day" property="i38OverDay" />
+        <result column="i_39_over_day" property="i39OverDay" />
+        <result column="i_40_over_day" property="i40OverDay" />
+        <result column="i_41_over_day" property="i41OverDay" />
+        <result column="i_42_over_day" property="i42OverDay" />
+        <result column="i_43_over_day" property="i43OverDay" />
+        <result column="i_44_over_day" property="i44OverDay" />
+        <result column="i_45_over_day" property="i45OverDay" />
+        <result column="i_46_over_day" property="i46OverDay" />
+        <result column="i_47_over_day" property="i47OverDay" />
+        <result column="i_48_over_day" property="i48OverDay" />
+        <result column="i_49_over_day" property="i49OverDay" />
+        <result column="i_50_over_day" property="i50OverDay" />
+        <result column="unbalance_over_day" property="unbalanceOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getMonthPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateQ">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getQuarterPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateY">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getYearPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_y
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="flicker_times" property="flickerTimes" />
+        <result column="is_flicker" property="isFlicker" />
+        <result column="inuharm_times" property="inuharmTimes" />
+        <result column="is_inuharm" property="isInuharm" />
+        <result column="is_inuharm_1" property="isInuharm1" />
+        <result column="is_inuharm_2" property="isInuharm2" />
+        <result column="is_inuharm_3" property="isInuharm3" />
+        <result column="is_inuharm_4" property="isInuharm4" />
+        <result column="is_inuharm_5" property="isInuharm5" />
+        <result column="is_inuharm_6" property="isInuharm6" />
+        <result column="is_inuharm_7" property="isInuharm7" />
+        <result column="is_inuharm_8" property="isInuharm8" />
+        <result column="is_inuharm_9" property="isInuharm9" />
+        <result column="is_inuharm_10" property="isInuharm10" />
+        <result column="is_inuharm_11" property="isInuharm11" />
+        <result column="is_inuharm_12" property="isInuharm12" />
+        <result column="is_inuharm_13" property="isInuharm13" />
+        <result column="is_inuharm_14" property="isInuharm14" />
+        <result column="is_inuharm_15" property="isInuharm15" />
+        <result column="is_inuharm_16" property="isInuharm16" />
+        <result column="is_inuharm_17" property="isInuharm17" />
+        <result column="is_inuharm_18" property="isInuharm18" />
+        <result column="is_inuharm_19" property="isInuharm19" />
+        <result column="is_inuharm_20" property="isInuharm20" />
+        <result column="is_inuharm_21" property="isInuharm21" />
+        <result column="is_inuharm_22" property="isInuharm22" />
+        <result column="is_inuharm_23" property="isInuharm23" />
+        <result column="is_inuharm_24" property="isInuharm24" />
+        <result column="is_inuharm_25" property="isInuharm25" />
+        <result column="is_inuharm_26" property="isInuharm26" />
+        <result column="is_inuharm_27" property="isInuharm27" />
+        <result column="is_inuharm_28" property="isInuharm28" />
+        <result column="is_inuharm_29" property="isInuharm29" />
+        <result column="is_inuharm_30" property="isInuharm30" />
+        <result column="is_inuharm_31" property="isInuharm31" />
+        <result column="is_inuharm_32" property="isInuharm32" />
+        <result column="is_inuharm_33" property="isInuharm33" />
+        <result column="is_inuharm_34" property="isInuharm34" />
+        <result column="is_inuharm_35" property="isInuharm35" />
+        <result column="is_inuharm_36" property="isInuharm36" />
+        <result column="is_inuharm_37" property="isInuharm37" />
+        <result column="is_inuharm_38" property="isInuharm38" />
+        <result column="is_inuharm_39" property="isInuharm39" />
+        <result column="is_inuharm_40" property="isInuharm40" />
+        <result column="is_inuharm_41" property="isInuharm41" />
+        <result column="is_inuharm_42" property="isInuharm42" />
+        <result column="is_inuharm_43" property="isInuharm43" />
+        <result column="is_inuharm_44" property="isInuharm44" />
+        <result column="is_inuharm_45" property="isInuharm45" />
+        <result column="is_inuharm_46" property="isInuharm46" />
+        <result column="is_inuharm_47" property="isInuharm47" />
+        <result column="is_inuharm_48" property="isInuharm48" />
+        <result column="is_inuharm_49" property="isInuharm49" />
+        <result column="is_inuharm_50" property="isInuharm50" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="inuharm_over_day" property="inuharmOverDay" />
+        <result column="inuharm_1_over_day" property="inuharm1OverDay" />
+        <result column="inuharm_2_over_day" property="inuharm2OverDay" />
+        <result column="inuharm_3_over_day" property="inuharm3OverDay" />
+        <result column="inuharm_4_over_day" property="inuharm4OverDay" />
+        <result column="inuharm_5_over_day" property="inuharm5OverDay" />
+        <result column="inuharm_6_over_day" property="inuharm6OverDay" />
+        <result column="inuharm_7_over_day" property="inuharm7OverDay" />
+        <result column="inuharm_8_over_day" property="inuharm8OverDay" />
+        <result column="inuharm_9_over_day" property="inuharm9OverDay" />
+        <result column="inuharm_10_over_day" property="inuharm10OverDay" />
+        <result column="inuharm_11_over_day" property="inuharm11OverDay" />
+        <result column="inuharm_12_over_day" property="inuharm12OverDay" />
+        <result column="inuharm_13_over_day" property="inuharm13OverDay" />
+        <result column="inuharm_14_over_day" property="inuharm14OverDay" />
+        <result column="inuharm_15_over_day" property="inuharm15OverDay" />
+        <result column="inuharm_16_over_day" property="inuharm16OverDay" />
+        <result column="inuharm_17_over_day" property="inuharm17OverDay" />
+        <result column="inuharm_18_over_day" property="inuharm18OverDay" />
+        <result column="inuharm_19_over_day" property="inuharm19OverDay" />
+        <result column="inuharm_20_over_day" property="inuharm20OverDay" />
+        <result column="inuharm_21_over_day" property="inuharm21OverDay" />
+        <result column="inuharm_22_over_day" property="inuharm22OverDay" />
+        <result column="inuharm_23_over_day" property="inuharm23OverDay" />
+        <result column="inuharm_24_over_day" property="inuharm24OverDay" />
+        <result column="inuharm_25_over_day" property="inuharm25OverDay" />
+        <result column="inuharm_26_over_day" property="inuharm26OverDay" />
+        <result column="inuharm_27_over_day" property="inuharm27OverDay" />
+        <result column="inuharm_28_over_day" property="inuharm28OverDay" />
+        <result column="inuharm_29_over_day" property="inuharm29OverDay" />
+        <result column="inuharm_30_over_day" property="inuharm30OverDay" />
+        <result column="inuharm_31_over_day" property="inuharm31OverDay" />
+        <result column="inuharm_32_over_day" property="inuharm32OverDay" />
+        <result column="inuharm_33_over_day" property="inuharm33OverDay" />
+        <result column="inuharm_34_over_day" property="inuharm34OverDay" />
+        <result column="inuharm_35_over_day" property="inuharm35OverDay" />
+        <result column="inuharm_36_over_day" property="inuharm36OverDay" />
+        <result column="inuharm_37_over_day" property="inuharm37OverDay" />
+        <result column="inuharm_38_over_day" property="inuharm38OverDay" />
+        <result column="inuharm_39_over_day" property="inuharm39OverDay" />
+        <result column="inuharm_40_over_day" property="inuharm40OverDay" />
+        <result column="inuharm_41_over_day" property="inuharm41OverDay" />
+        <result column="inuharm_42_over_day" property="inuharm42OverDay" />
+        <result column="inuharm_43_over_day" property="inuharm43OverDay" />
+        <result column="inuharm_44_over_day" property="inuharm44OverDay" />
+        <result column="inuharm_45_over_day" property="inuharm45OverDay" />
+        <result column="inuharm_46_over_day" property="inuharm46OverDay" />
+        <result column="inuharm_47_over_day" property="inuharm47OverDay" />
+        <result column="inuharm_48_over_day" property="inuharm48OverDay" />
+        <result column="inuharm_49_over_day" property="inuharm49OverDay" />
+        <result column="inuharm_50_over_day" property="inuharm50OverDay" />
+        <result column="flicker_over_day" property="flickerOverDay" />
+    </resultMap>
+    <select id="getRMpPartHarmonicDetail" resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO">
+        select
+            rms.measurement_point_id,
+            rmphdm.data_date,
+            rms.inuharm_over_day,
+            rms.inuharm_1_over_day,
+            rms.inuharm_2_over_day,
+            rms.inuharm_3_over_day,
+            rms.inuharm_4_over_day,
+            rms.inuharm_5_over_day,
+            rms.inuharm_6_over_day,
+            rms.inuharm_7_over_day,
+            rms.inuharm_8_over_day,
+            rms.inuharm_9_over_day,
+            rms.inuharm_10_over_day,
+            rms.inuharm_11_over_day,
+            rms.inuharm_12_over_day,
+            rms.inuharm_13_over_day,
+            rms.inuharm_14_over_day,
+            rms.inuharm_15_over_day,
+            rms.inuharm_16_over_day,
+            rms.inuharm_17_over_day,
+            rms.inuharm_18_over_day,
+            rms.inuharm_19_over_day,
+            rms.inuharm_20_over_day,
+            rms.inuharm_21_over_day,
+            rms.inuharm_22_over_day,
+            rms.inuharm_23_over_day,
+            rms.inuharm_24_over_day,
+            rms.flicker_over_day,
+            rmphdm.measurement_point_id,
+            rmphdm.measurement_over_day,
+            rmphdm.freq_over_day,
+            rmphdm.v_dev_up_over_day,
+            rmphdm.v_dev_low_over_day,
+            rmphdm.v_dev_over_day,
+            rmphdm.v_thd_over_day,
+            rmphdm.v_over_day,
+            rmphdm.i_over_day,
+            rmphdm.v_2_over_day,
+            rmphdm.v_3_over_day,
+            rmphdm.v_4_over_day,
+            rmphdm.v_5_over_day,
+            rmphdm.v_6_over_day,
+            rmphdm.v_7_over_day,
+            rmphdm.v_8_over_day,
+            rmphdm.v_9_over_day,
+            rmphdm.v_10_over_day,
+            rmphdm.v_11_over_day,
+            rmphdm.v_12_over_day,
+            rmphdm.v_13_over_day,
+            rmphdm.v_14_over_day,
+            rmphdm.v_15_over_day,
+            rmphdm.v_16_over_day,
+            rmphdm.v_17_over_day,
+            rmphdm.v_18_over_day,
+            rmphdm.v_19_over_day,
+            rmphdm.v_20_over_day,
+            rmphdm.v_21_over_day,
+            rmphdm.v_22_over_day,
+            rmphdm.v_23_over_day,
+            rmphdm.v_24_over_day,
+            rmphdm.v_25_over_day,
+            rmphdm.i_2_over_day,
+            rmphdm.i_3_over_day,
+            rmphdm.i_4_over_day,
+            rmphdm.i_5_over_day,
+            rmphdm.i_6_over_day,
+            rmphdm.i_7_over_day,
+            rmphdm.i_8_over_day,
+            rmphdm.i_9_over_day,
+            rmphdm.i_10_over_day,
+            rmphdm.i_11_over_day,
+            rmphdm.i_12_over_day,
+            rmphdm.i_13_over_day,
+            rmphdm.i_14_over_day,
+            rmphdm.i_15_over_day,
+            rmphdm.i_16_over_day,
+            rmphdm.i_17_over_day,
+            rmphdm.i_18_over_day,
+            rmphdm.i_19_over_day,
+            rmphdm.i_20_over_day,
+            rmphdm.i_21_over_day,
+            rmphdm.i_22_over_day,
+            rmphdm.i_23_over_day,
+            rmphdm.i_24_over_day,
+            rmphdm.i_25_over_day,
+            rmphdm.unbalance_over_day,
+            rmphdm.i_neg_over_day
+        from r_mp_surplus_harmonic_detail_m rms
+        right join r_mp_part_harmonic_detail_m rmphdm on rms.measurement_point_id = rmphdm.measurement_point_id
+        and rms.data_date=rmphdm.data_date
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rmphdm.measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rmphdm.data_date >= #{param.startTime} AND rms.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rmphdm.data_date &lt;= #{param.endTime}  AND  rms.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicD">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement" property="overLimitMeasurement" />
+        <result column="over_limit_measurement_ratio" property="overLimitMeasurementRatio" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="over_day" property="overDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicVoltageDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="voltage_type" property="voltageType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="voltage_type" property="voltageType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="over_day" property="overDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getMonthStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getQuarterStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getYearStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_y
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
+        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="over_day_accrued" property="overDayAccrued" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getMonthRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+           	rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
+            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+                SELECT
+                    over_limit_measurement_average
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                <if test="param!=null and param.startTime != null and param.startTime !=''">
+                    AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+                </if>
+                <if test="param!=null and param.endTime != null and param.endTime !=''">
+                    AND (data_date &lt;= date(
+                    DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+                </if>
+
+        ) chainAverage ,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+                    </if>
+        ) chainAccrued ,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+                    </if>
+        ) sameAverage,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+                    </if>
+
+        ) sameAccrued ,
+        TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay
+        FROM
+        r_stat_harmonic_org_m c
+        RIGHT JOIN r_stat_org_m AS rso ON rso.org_no = c.org_no
+        <where>
+            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            rso.org_no,
+            rso.effective_measurement_accrued as allCount,
+            rso.freq_pass_rate,
+            ry.freq_pass_rate as freqPassRateYear,
+            rso.v_dev_pass_rate,
+            ry.v_dev_pass_rate as vDevPassRateYear,
+            rso.flicker_pass_rate,
+            ry.flicker_pass_rate as flickerPassRateYear
+        from
+            r_stat_org_m rso
+        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
+        <where>
+            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
+        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getQuarterRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+            rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
+            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+            SELECT
+            over_limit_measurement_average
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) chainAverage ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) chainAccrued ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+            </if>
+        ) sameAverage,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+            </if>
+
+        ) sameAccrued,
+        c.average_over_day
+        FROM
+            r_stat_harmonic_org_q c
+        RIGHT JOIN r_stat_org_q AS rso ON rso.org_no = c.org_no
+        <where>
+            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            rso.org_no,
+            rso.effective_measurement_accrued as allCount,
+            rso.freq_pass_rate,
+            ry.freq_pass_rate as freqPassRateYear,
+            rso.v_dev_pass_rate,
+            ry.v_dev_pass_rate as vDevPassRateYear,
+            rso.flicker_pass_rate,
+            ry.flicker_pass_rate as flickerPassRateYear
+        from
+             r_stat_org_q rso
+        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
+        <where>
+            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getYearRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+            rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.over_limit_measurement_average AS harmonicMeasurementAverage,
+            rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+            SELECT
+            over_limit_measurement_average
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) chainAverage ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) chainAccrued ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) sameAverage,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) sameAccrued,
+        c.average_over_day
+        FROM
+            r_stat_harmonic_org_y c
+        RIGHT JOIN r_stat_org_y AS rso ON rso.org_no = c.org_no
+        <where>
+                c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} and c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime} and c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+
+    </select>
+    <select id="getYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            org_no,
+            effective_measurement_accrued as allCount,
+            freq_pass_rate,
+            freq_pass_rate as freqPassRateYear,
+            v_dev_pass_rate,
+            v_dev_pass_rate as vDevPassRateYear,
+            flicker_pass_rate,
+            flicker_pass_rate as flickerPassRateYear
+        from
+            r_stat_org_y rso
+        <where>
+            and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationM">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_over_day" property="harmonicOverDay" />
+        <result column="harmonic_count" property="harmonicCount" />
+        <result column="freq_over_day" property="freqOverDay" />
+        <result column="freq_count" property="freqCount" />
+        <result column="v_dev_over_day" property="vDevOverDay" />
+        <result column="v_dev_count" property="vDevCount" />
+        <result column="v_over_day" property="vOverDay" />
+        <result column="v_count" property="vCount" />
+        <result column="i_over_day" property="iOverDay" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_over_day" property="unbalanceOverDay" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_over_day" property="flickerOverDay" />
+        <result column="flicker_count" property="flickerCount" />
+        <result column="inuharm_over_day" property="inuharmOverDay" />
+        <result column="inuharm_count" property="inuharmCount" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconM" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+            COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+            (
+                SELECT
+                        substation_id,
+                        harmonic_over_day
+                FROM
+                        r_stat_substation_m
+                        <where>
+                            <if test="param != null and param.ids != null and param.ids.size > 0">
+                                AND substation_id IN
+                                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                                    #{item}
+                                </foreach>
+                            </if>
+                            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                                AND  data_date >= #{param.startTime}
+                            </if>
+                            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                                AND  #{param.endTime}>= data_date
+                            </if>
+                        </where>
+            ) X
+    </select>
+    <select id="getStatSubstationIcon2M" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_over_day / freq_count as 'freqAverageOverDay',
+            v_dev_over_day / v_dev_count as 'vDevAverageOverDay',
+            v_over_day / v_count as 'vAverageOverDay',
+            i_over_day / i_count as 'iAverageOverDay',
+            unbalance_over_day / unbalance_count as 'unbalanceAverageOverDay',
+            i_neg_over_day / i_neg_count as 'iNegAverageOverDay',
+            flicker_over_day / flicker_count as 'flickerAverageOverDay',
+            inuharm_over_day / inuharm_count as 'inuharmAverageOverDay'
+        FROM
+            r_stat_substation_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationQ">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_average_over_day" property="harmonicAverageOverDay" />
+        <result column="freq_average_over_day" property="freqAverageOverDay" />
+        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
+        <result column="v_average_over_day" property="vAverageOverDay" />
+        <result column="i_average_over_day" property="iAverageOverDay" />
+        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
+        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
+        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
+        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconQ" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+            COALESCE( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+        (
+                    SELECT
+                        substation_id,
+                        harmonic_average_over_day
+                    FROM
+                        r_stat_substation_q
+                <where>
+                    <if test="param != null and  param.ids != null and param.ids.size > 0">
+                        AND substation_id IN
+                        <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND data_date >= #{param.startTime}
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime != ''">
+                        AND #{param.endTime}>= data_date
+                    </if>
+                </where>
+
+        ) X
+
+    </select>
+    <select id="getStatSubstationIcon2Q" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_average_over_day,
+            v_dev_average_over_day,
+            v_average_over_day,
+            i_average_over_day,
+            unbalance_average_over_day,
+            i_neg_average_over_day,
+            flicker_average_over_day,
+            inuharm_average_over_day
+        FROM
+            r_stat_substation_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="substation_voltage" property="substationVoltage" />
+        <result column="substation_count" property="substationCount" />
+        <result column="harmonic_count" property="harmonicCount" />
+        <result column="event_count" property="eventCount" />
+    </resultMap>
+    <select id="getStatSubstationIcon" resultType="com.njcn.harmonic.pojo.vo.RVoltageIconVO">
+        SELECT
+        substation_voltage as 'substationVoltage',
+        sum( substation_count ) as 'substationCount',
+        sum( harmonic_count ) as 'harmonicCount'
+        FROM
+        r_stat_substation_voltage_m
+        <where>
+            <if test="param != null and param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND  #{param.endTime} >= data_date
+            </if>
+        </where>
+        GROUP BY substation_voltage
+    </select>
+
+
+</mapper>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationY">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_over_day" property="harmonicOverDay" />
+        <result column="freq_average_over_day" property="freqAverageOverDay" />
+        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
+        <result column="v_average_over_day" property="vAverageOverDay" />
+        <result column="i_average_over_day" property="iAverageOverDay" />
+        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
+        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
+        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
+        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconY" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+                COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+        (
+                    SELECT
+                        substation_id,
+                        harmonic_over_day
+                    FROM
+                         r_stat_substation_y
+                    <where>
+                        <if test="param != null and param.ids != null and param.ids.size > 0">
+                            AND substation_id IN
+                            <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                                #{item}
+                            </foreach>
+                        </if>
+                        <if test="param!=null and param.startTime != null and param.startTime !=''">
+                            AND  data_date >= #{param.startTime}
+                        </if>
+                        <if test="param!=null and param.endTime != null and param.endTime != ''">
+                            AND  #{param.endTime}>= data_date
+                        </if>
+                    </where>
+
+        ) X
+
+    </select>
+    <select id="getStatSubstationIcon2Y" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_average_over_day,
+            v_dev_average_over_day,
+            v_average_over_day,
+            i_average_over_day,
+            unbalance_average_over_day,
+            i_neg_average_over_day,
+            flicker_average_over_day,
+            inuharm_average_over_day
+        FROM
+            r_stat_substation_y
+        <where>
+            <if test="param != null and param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+
+/**
+ * 数据是否异常
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+public interface DataExceptionService {
+
+    /**
+     * 监测点数据是否异常
+     * @author qijian
+     * @date 2022/10/26
+     */
+    boolean lineDataException(AlgorithmSearchParam algorithmSearchParam);
+}

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

@@ -0,0 +1,20 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+
+/**
+ * 数据完整率算法
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+public interface DataIntegrityRateService {
+
+    /**
+     * 监测点日数据完整率
+     * @author qijian
+     * @date 2022/10/26
+     */
+    boolean lineDataIntegrityRate(AlgorithmSearchParam algorithmSearchParam);
+}

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

@@ -0,0 +1,25 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelMService extends IService<RMpBenchmarkLevelM> {
+
+    /***
+     * 查询区域稳态电能质量水平(月)
+     * @author jianghaifei
+     * @date 2022-10-11 11:26
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM>
+     */
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_q】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelQService extends IService<RMpBenchmarkLevelQ> {
+
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_y】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelYService extends IService<RMpBenchmarkLevelY> {
+
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Service
+* @createDate 2022-10-20 18:38:15
+*/
+public interface RMpHarmonicIMagReportDService extends IService<RMpHarmonicIMagReportD> {
+
+    List<RMpHarmonicIMagReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Service
+* @createDate 2022-10-20 18:43:52
+*/
+public interface RMpHarmonicIRateReportDService extends IService<RMpHarmonicIRateReportD> {
+
+    List<RMpHarmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam;
+import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO;
+
+import java.util.List;
+
+/**
+ * @Title RMpHarmonicReportDService
+ * @Package com.njcn.harmonic.service
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:18
+ * @Version V1.0
+ */
+public interface RMpHarmonicReportDService {
+
+    List<RMpHarmonicReportDVO> getMonitorStatisticsD(RMpHarmonicReportDParam rMpHarmonicReportDParam);
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_harmonic_v_rate_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 )】的数据库操作Service
+* @createDate 2022-10-20 18:34:05
+*/
+public interface RMpHarmonicVRateReportDService extends IService<RMpHarmonicVRateReportD> {
+
+    List<RMpHarmonicVRateReportD> getListByCond(Map<String, Object> map);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Service
+* @createDate 2022-10-20 18:45:58
+*/
+public interface RMpInharmonicIRateReportDService extends IService<RMpInharmonicIRateReportD> {
+
+    List<RMpInharmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Service
+* @createDate 2022-10-20 18:45:36
+*/
+public interface RMpInharmonicVRateReportDService extends IService<RMpInharmonicVRateReportD> {
+
+    List<RMpInharmonicVRateReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_phase_report_d】的数据库操作Service
+* @createDate 2022-10-20 18:20:08
+*/
+public interface RMpMeasurePhaseReportDService extends IService<RMpMeasurePhaseReportD> {
+
+    List<RMpMeasurePhaseReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpMeasureReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_measure_report_d】的数据库操作Service
+* @createDate 2022-10-20 16:32:37
+*/
+public interface RMpMeasureReportDService extends IService<RMpMeasureReportD> {
+
+    List<RMpMeasureReportD> getListByCond(Map<String, Object> condMap);
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailDService extends IService<RMpPartHarmonicDetailD> {
+
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param);
+}

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

@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailMService extends IService<RMpPartHarmonicDetailM> {
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(RStatOrgParam param);
+}

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

@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateQ;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateService extends IService<RMpPassRateQ> {
+
+    /**
+     * 稳态指标合格率明细表
+     * @param param
+     * @return
+     */
+    List<RStatOrgIndexVO> getRMpPassRateInfo(RStatOrgParam param);
+}

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

@@ -0,0 +1,42 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicM;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+public interface RStatHarmonicMService extends IService<RStatHarmonicM> {
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+
+    /**
+     * 稳态电铁-频率偏差-电压统计图
+     * @return
+     */
+    List<RIconVO> getRStatHarmonicIcon(RStatHarmonicMParam param);
+
+    /**
+     * 稳态电铁-频率偏差-越线日期统计图
+     * @return
+     */
+    List<RHarmonicPolylineVO> getRStatHarmonicIcon2(RStatHarmonicMParam param);
+
+}