代码调整

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

@@ -55,9 +55,9 @@ public class IntegrityController extends BaseController {
     @PostMapping("/getIntegrityIcon")
     @ApiOperation("数据完整性图表")
     @ApiImplicitParam(name = "integrityIconParam", value = "数据完整性参数", required = true)
-    public HttpResult<IntegrityIconVO> getIntegrityIcon(@RequestBody @Validated DeviceInfoParam.CompareBusinessParam integrityIconParam) {
+    public HttpResult<List<IntegrityIconVO>> getIntegrityIcon(@RequestBody @Validated DeviceInfoParam.CompareBusinessParam integrityIconParam) {
         String methodDescribe = getMethodDescribe("getIntegrityIcon");
-        IntegrityIconVO integrityIconVO = integrityService.getIntegrityIcon(integrityIconParam);
+        List<IntegrityIconVO> integrityIconVO = integrityService.getIntegrityIcon(integrityIconParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, integrityIconVO, methodDescribe);
     }
 

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

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

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

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

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

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

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

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

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

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

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

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