Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

数据上送逻辑调整-支持指定数据上送

Browse Source
This commit is contained in:
xuyang
2023-12-15 09:05:26 +08:00
parent b0d2b611ad
commit f974951889
11 changed files with 142 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java
View File

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
import com.njcn.harmonic.service.upload.IEvaluationDataService;
@@ -39,7 +40,7 @@ public class EvaluationDataController extends BaseController {
@PostMapping("/getEvaluationData")
@ApiOperation("查询母线基准水平评估数据")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<Page<UploadEvaluationDataVo>> getEvaluationData(@RequestBody UploadParam param) {
public HttpResult<Page<UploadEvaluationDataVo>> getEvaluationData(@RequestBody UploadDataParam param) {
String methodDescribe = getMethodDescribe("getEvaluationData");
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
Page<UploadEvaluationDataVo> list = evaluationDataService.getEvaluationData(param);
@@ -49,11 +50,11 @@ public class EvaluationDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/uploadEvaluationData")
@ApiOperation("国网上送-母线基准水平评估数据")
@ApiImplicitParam(name = "time", value = "时间", required = true)
public HttpResult<String> uploadEvaluationData(@RequestParam("time") String time) {
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<String> uploadEvaluationData(@RequestBody UploadParam param) {
String methodDescribe = getMethodDescribe("uploadEvaluationData");
LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
String result = evaluationDataService.uploadEvaluationData(time);
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
String result = evaluationDataService.uploadEvaluationData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

11
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PointStatisticalDataController.java
View File

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
import com.njcn.harmonic.pojo.vo.upload.UploadPointStatisticalDataVo;
import com.njcn.harmonic.service.upload.IPointStatisticalDataService;
@@ -40,7 +41,7 @@ public class PointStatisticalDataController extends BaseController {
@PostMapping("/getPointStatisticalData")
@ApiOperation("查询主配网监测点统计数据")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<Page<UploadPointStatisticalDataVo>> getPointStatisticalData(@RequestBody UploadParam param) {
public HttpResult<Page<UploadPointStatisticalDataVo>> getPointStatisticalData(@RequestBody UploadDataParam param) {
String methodDescribe = getMethodDescribe("getPointStatisticalData");
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
Page<UploadPointStatisticalDataVo> list = pointStatisticalDataService.getPointStatisticalData(param);
@@ -50,11 +51,11 @@ public class PointStatisticalDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/uploadPointStatisticalData")
@ApiOperation("国网上送-主配网监测点统计数据")
@ApiImplicitParam(name = "time", value = "时间", required = true)
public HttpResult<String> uploadPointStatisticalData(@RequestParam("time") String time) {
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<String> uploadPointStatisticalData(@RequestBody UploadParam param) {
String methodDescribe = getMethodDescribe("uploadPointStatisticalData");
LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
String result = pointStatisticalDataService.uploadPointStatisticalData(time);
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
String result = pointStatisticalDataService.uploadPointStatisticalData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

11
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/SubstationStatisticalDataController.java
View File

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
import com.njcn.harmonic.pojo.vo.upload.UploadSubstationStatisticalDataVo;
import com.njcn.harmonic.service.upload.ISubstationStatisticalDataService;
@@ -40,7 +41,7 @@ public class SubstationStatisticalDataController extends BaseController {
@PostMapping("/getSubstationStatisticalData")
@ApiOperation("查询变电站监测统计数据")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<Page<UploadSubstationStatisticalDataVo>> getSubstationStatisticalData(@RequestBody UploadParam param) {
public HttpResult<Page<UploadSubstationStatisticalDataVo>> getSubstationStatisticalData(@RequestBody UploadDataParam param) {
String methodDescribe = getMethodDescribe("getSubstationStatisticalData");
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
Page<UploadSubstationStatisticalDataVo> list = substationStatisticalDataService.getSubstationStatisticalData(param);
@@ -50,11 +51,11 @@ public class SubstationStatisticalDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/uploadSubstationStatisticalData")
@ApiOperation("国网上送-变电站监测统计数据")
@ApiImplicitParam(name = "time", value = "时间", required = true)
public HttpResult<String> uploadSubstationStatisticalData(@RequestParam("time") String time) {
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<String> uploadSubstationStatisticalData(@RequestBody UploadParam param) {
String methodDescribe = getMethodDescribe("uploadSubstationStatisticalData");
LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
String result = substationStatisticalDataService.uploadSubstationStatisticalData(time);
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
String result = substationStatisticalDataService.uploadSubstationStatisticalData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}