代码调整

2022-11-08 09:48:02 +08:00
parent 7b0c2435fc
commit 3abd49707f
290 changed files with 13772 additions and 1639 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java
@@ -49,8 +49,8 @@ public class CustomReportController extends BaseController {
    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.ADD)
    @PostMapping("/addTemplate")
    @ApiOperation("新增自定义报表模板")
-    @ApiImplicitParam(name = "reportTemplateParam", value = "实体参数", required = true)
-    public HttpResult<Boolean> addCustomReportTemplate(@RequestBody @Validated ReportTemplateParam reportTemplateParam){
+//    @ApiImplicitParam(name = "reportTemplateParam", value = "实体参数", required = true)
+    public HttpResult<Boolean> addCustomReportTemplate(@Validated ReportTemplateParam reportTemplateParam){
        String methodDescribe = getMethodDescribe("addCustomReportTemplate");
        boolean res = customReportService.addCustomReportTemplate(reportTemplateParam);
        if(res){
@@ -132,8 +132,8 @@ public class CustomReportController extends BaseController {
    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.UPDATE)
    @PostMapping("/updateTemplate")
    @ApiOperation("修改自定义报表模板")
-    @ApiImplicitParam(name = "reportTemplateParam", value = "实体参数", required = true)
-    public HttpResult<Boolean> updateCustomReportTemplate(@RequestBody @Validated ReportTemplateParam.UpdateReportTemplateParam reportTemplateParam){
+//    @ApiImplicitParam(name = "reportTemplateParam", value = "实体参数", required = true)
+    public HttpResult<Boolean> updateCustomReportTemplate(@Validated ReportTemplateParam.UpdateReportTemplateParam reportTemplateParam){
        String methodDescribe = getMethodDescribe("updateCustomReportTemplate");
        boolean res = customReportService.updateCustomReportTemplate(reportTemplateParam);
        if(res){
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PwRStatHarmonicController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PwRStatHarmonicController.java
@@ -0,0 +1,87 @@
+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);
+    }
+
+}
+
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
@@ -23,7 +23,7 @@ import java.util.List;

 /**
 * <p>
- *  前端控制器
+ * 前端控制器
 * </p>
 *
 * @author rui.wu
@@ -45,7 +45,7 @@ public class RStatHarmonicMController extends BaseController {
    @GetMapping("/getAllRStatHarmonic")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("查询稳态累计超标监测点数")
-    public HttpResult<List<RArrayVO>> getAllRStatHarmonicM(StatisticsBizBaseParam param){
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonic(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatHarmonic");
        List<RArrayVO> rStatHarmonicMAll = null;
        String string = param.getType().toString();
@@ -74,9 +74,9 @@ public class RStatHarmonicMController extends BaseController {
    @GetMapping("/getRStatHarmonicIconVoltage")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("稳态电铁-频率偏差-电压统计图")
-    public HttpResult<List<RIconVO>> getRStatHarmonicIcon(RStatHarmonicMParam param){
+    public HttpResult<List<RIconVO>> getRStatHarmonicIconVoltage(RStatHarmonicMParam param) {
        String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage");
-        List<RIconVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon(param);
+        List<RIconVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconVoltage(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
    }

@@ -86,9 +86,9 @@ public class RStatHarmonicMController extends BaseController {
    @GetMapping("/getRStatHarmonicIconDate")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("稳态电铁-频率偏差-越线日期统计图")
-    public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIcon2(RStatHarmonicMParam param){
+    public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIconDate(RStatHarmonicMParam param) {
        String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
-        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon2(param);
+        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
    }

--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
@@ -25,7 +25,7 @@ import java.util.List;

 /**
 * <p>
- *  前端控制器
+ * 前端控制器
 * </p>
 *
 * @author rui.wu
@@ -47,7 +47,7 @@ public class RStatHarmonicOrgMController extends BaseController {
    @GetMapping("/getAllRStatHarmonicOrg")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("查询稳态累计超标监测点数")
-    public HttpResult<List<RArrayVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
        List<RArrayVO> rStatHarmonicOrgMAll = null;
        String string = param.getType().toString();
@@ -77,7 +77,7 @@ public class RStatHarmonicOrgMController extends BaseController {
    @GetMapping("/getAllRStatHarmonicOrgIcon")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("查询稳态各单位超标监测统计图")
-    public HttpResult<List<RIconVO>> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param){
+    public HttpResult<List<RIconVO>> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrgIcon");
        List<RIconVO> getAllRStatHarmonicOrgIcon = null;
        String string = param.getType().toString();
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
@@ -52,7 +52,7 @@ public class RStatOrgController extends BaseController {
    @GetMapping("/getAllRStatHarmonicOrg")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("区域超标统计")
-    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
        List<RStatOrgVO> rStatHarmonicOrgMAll = null;
        String string = param.getType().toString();
@@ -82,7 +82,7 @@ public class RStatOrgController extends BaseController {
    @GetMapping("/getRStatSubstation")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("区域稳态指标超标分类统计表")
-    public HttpResult<List<RStatSubstationOrg2VO>> getAllRStatSubstation(StatisticsBizBaseParam param){
+    public HttpResult<List<RStatSubstationOrg2VO>> getRStatSubstation(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getRStatSubstation");
        List<RStatSubstationOrg2VO> statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
@@ -91,24 +91,25 @@ public class RStatOrgController extends BaseController {
    /**
     * 区域稳态指标超标分类统计表
     */
-//    @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);
-//    }
+    @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){
+    public HttpResult<List<RArrayVO>> getRStatLoadType(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getRStatLoadType");
        List<RArrayVO> rStatLoadType = rStatLoadTypeService.getRStatLoadType(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatLoadType, methodDescribe);
@@ -116,6 +117,7 @@ public class RStatOrgController extends BaseController {

    /**
     * 变电站（换流站）稳态指标超标分类统计表
+     *
     * @param param
     * @return
     */
@@ -123,7 +125,7 @@ public class RStatOrgController extends BaseController {
    @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);
@@ -131,26 +133,29 @@ public class RStatOrgController extends BaseController {

    /**
     * 稳态指标超标明细表
+     *
     * @param param
     * @return
     */
    @PostMapping("/getRMpPartHarmonicDetail")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("稳态指标超标明细表")
-    public HttpResult<List<RMpPartHarmonicDetailVO>> getRMpPartHarmonicDetail(@RequestBody RStatOrgParam param){
+    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){
+    public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
        List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
@@ -158,13 +163,14 @@ public class RStatOrgController extends BaseController {

    /**
     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     *
     * @param param
     * @return
     */
    @GetMapping("/getRStatOrgIndex")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("区域稳态指标合格率统计表")
-    public HttpResult<List<RStatOrgIndexVO.RStatOrgIndexInfoVO>> getRStatOrgIndex(StatisticsBizBaseParam param){
+    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);
@@ -172,13 +178,14 @@ public class RStatOrgController extends BaseController {

    /**
     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     *
     * @param param
     * @return
     */
    @PostMapping("/getRMpPassRateInfo")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("稳态指标合格率明细表")
-    public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param){
+    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);
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
@@ -26,7 +26,7 @@ import java.util.List;

 /**
 * <p>
- *  前端控制器
+ * 前端控制器
 * </p>
 *
 * @author rui.wu
@@ -47,7 +47,7 @@ public class RStatSubstationMController extends BaseController {
    @GetMapping("/getAllRStatSubstationIconDays")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("变电站稳态指标超标分布（按超标天数）")
-    public HttpResult<RSubstationIconVO> getAllRStatSubstation(StatisticsBizBaseParam param){
+    public HttpResult<RSubstationIconVO> getAllRStatSubstationIconDays(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconDays");
        RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
@@ -59,7 +59,7 @@ public class RStatSubstationMController extends BaseController {
    @GetMapping("/getAllRStatSubstationIconVoltage")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("变电站稳态指标超标分布（按电压等级）")
-    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIcon2(StatisticsBizBaseParam param){
+    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIconVoltage(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconVoltage");
        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
@@ -72,7 +72,7 @@ public class RStatSubstationMController extends BaseController {
    @GetMapping("/getAllRStatSubstationIconAvgDays")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("变电站稳态指标平均超标天数")
-    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIcon3(StatisticsBizBaseParam param){
+    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIconAvgDays(StatisticsBizBaseParam param) {
        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconAvgDays");
        List<RSubstationIcon2VO> statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java
@@ -14,14 +14,12 @@ import com.njcn.harmonic.service.THDistortionService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.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;
+import org.springframework.web.bind.annotation.*;

 import java.util.List;

@@ -62,11 +60,15 @@ public class THDController extends BaseController {

    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/getTHDTopTenData")
-    @ApiOperation("谐波总畸变率前十列表")
-    @ApiImplicitParam(name = "statisticsBizBaseParam", value = "业务参数", required = true)
-    public HttpResult<List<RMpVThdVO>> getTHDTopTenData(@RequestBody @Validated StatisticsBizBaseParam statisticsBizBaseParam){
+    @ApiOperation("谐波总畸变率topNum列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statisticsBizBaseParam", value = "业务参数", required = true),
+            @ApiImplicitParam(name = "topNum", value = "业务参数",defaultValue="10", required = true)
+    }
+    )
+    public HttpResult<List<RMpVThdVO>> getTHDTopTenData(@RequestBody @Validated StatisticsBizBaseParam statisticsBizBaseParam, @RequestParam Integer topNum){
        String methodDescribe = getMethodDescribe("getTHDTopTenData");
-        List<RMpVThdVO> list = thDistortionService.getTHDTopTenData(statisticsBizBaseParam);
+        List<RMpVThdVO> list = thDistortionService.getTHDTopTenData(statisticsBizBaseParam,topNum);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }