合并代码提交

This commit is contained in:
2022-11-17 15:19:08 +08:00
parent 52645fa5b0
commit 49b0d64cf1
65 changed files with 626 additions and 356 deletions

View File

@@ -4,6 +4,7 @@ package com.njcn.harmonic.controller.distribution;
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.param.RStatOrgParam;
@@ -35,12 +36,7 @@ import java.util.List;
public class PwRStatOrgController extends BaseController {
private final PwRStatOrgService pwRStatOrgService;
private final RStatOrgYService rStatOrgYService;
private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService;
private final RStatLoadTypeService rStatLoadTypeService;
private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService;
private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService;
private final RMpPassRateService rMpPassRateService;
/**
@@ -56,118 +52,75 @@ public class PwRStatOrgController extends BaseController {
}
// /**
// * 区域稳态指标超标分类统计表
// */
// @GetMapping("/getPwRStatSubstation")
// @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);
// }
/**
* 配网区域稳态指标超标分类统计表
*/
@PostMapping("/getPwRStatSubstation")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("区域稳态指标超标分类统计表")
public HttpResult<List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO>> getPwRStatSubstation(@RequestBody StatSubstationBizBaseParam param) {
String methodDescribe = getMethodDescribe("getPwRStatSubstation");
List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> statSubstationIcon = pwRStatOrgService.getRStatSubstationOrg(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
}
/**
* 区域稳态指标合格率统计表-主网(稳态指标合格率统计)
* 配网稳态指标超标明细表
*
* @param param
* @return
*/
@GetMapping("/getPwRStatOrgIndex")
@PostMapping("/getPwRMpPartHarmonicDetail")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("稳态指标超标明细表")
public HttpResult<List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO>> getPwRMpPartHarmonicDetail(@RequestBody StatSubstationBizBaseParam param) {
String methodDescribe = getMethodDescribe("getPwRMpPartHarmonicDetail");
List<RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO> rMpPartHarmonicDetail = pwRStatOrgService.getRMpPartHarmonicDetail(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
}
/**
* 配网稳态指标超标明细表-指标趋势图
*
* @param param
* @return
*/
@PostMapping("/getRMpPartHarmonicDetailIcon")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("稳态指标超标明细表-指标趋势图")
public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(@RequestBody StatisticsBizBaseParam param) {
String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
}
/**
* 配网区域稳态指标合格率统计表-配网(稳态指标合格率统计)
*
* @param param、
* @return
*/
@PostMapping("/getPwRStatOrgIndex")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("区域稳态指标合格率统计表")
public HttpResult<List<PwRStatOrgVO>>getRStatOrgIndex(StatSubstationBizBaseParam param) {
String methodDescribe = getMethodDescribe("getRStatOrgIndex");
public HttpResult<List<PwRStatOrgVO>> getPwRStatOrgIndex(@RequestBody StatSubstationBizBaseParam param) {
String methodDescribe = getMethodDescribe("getPwRStatOrgIndex");
List<PwRStatOrgVO> rStatOrg = pwRStatOrgService.getRStatOrgIndex(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
}
/**
* 区域稳态指标合格率统计表-网(稳态指标合格率统计)
* 区域稳态指标合格率统计表-网(稳态指标合格率统计)
*
* @param param
* @return
*/
@PostMapping("/getRMpPassRateInfo")
@PostMapping("/getPwRMpPassRateInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("稳态指标合格率明细表")
public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param) {
String methodDescribe = getMethodDescribe("getRMpPassRateInfo");
List<RStatOrgIndexVO> rStatOrg = rMpPassRateService.getRMpPassRateInfo(param);
public HttpResult<List<PwRStatOrgVO.PwRStatOrgDetailVO>> getPwRMpPassRateInfo(@RequestBody RStatOrgParam.PwRStatOrgParam param) {
String methodDescribe = getMethodDescribe("getPwRMpPassRateInfo");
List<PwRStatOrgVO.PwRStatOrgDetailVO> rStatOrg = pwRStatOrgService.getRMpPassRateInfo(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
}