合并代码

This commit is contained in:
2022-12-19 10:33:53 +08:00
parent a16f573eae
commit 5df53ce872
24 changed files with 1014 additions and 283 deletions

View File

@@ -1,11 +1,12 @@
package com.njcn.harmonic.controller.specialanalysis;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.harmonic.pojo.param.PowerQualityParam;
import com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO;
import com.njcn.harmonic.service.specialanalysis.DistributedPvVolOverService;
import com.njcn.web.controller.BaseController;
@@ -19,7 +20,6 @@ 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;
/**
* 专项分析-分布式光伏-电压越限分析
@@ -48,9 +48,9 @@ public class DistributedPvVolOverController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("获取分布式光伏电压越限分析")
@ApiImplicitParam(name = "param", value = "条件参数", required = true)
public HttpResult<List<RMpPvPowerDetailVO>> getVoltageOutOfLimitAnalysis(@RequestBody StatisticsBizBaseParam param) {
public HttpResult<Page<RMpPvPowerDetailVO>> getVoltageOutOfLimitAnalysis(@RequestBody PowerQualityParam param) {
String methodDescribe = getMethodDescribe("getVoltageOutOfLimitAnalysis");
List<RMpPvPowerDetailVO> list = distributedPvVolOverService.getVoltageOutOfLimitAnalysis(param);
Page<RMpPvPowerDetailVO> list = distributedPvVolOverService.getVoltageOutOfLimitAnalysis(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}