From d0d5011558c12337410350642e8c41da211e261b Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 22 一月 2025 14:53:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java index 1deb278..a56f5d5 100644 --- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java +++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java @@ -2,6 +2,7 @@ import com.iailab.framework.common.pojo.PageResult; import com.iailab.module.model.api.mcs.dto.*; +import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO; import com.iailab.module.model.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -106,15 +107,11 @@ @Operation(summary = "获取最后预测值") Map<String, BigDecimal> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO); - @GetMapping("/predict-data/electric") - @Operation(summary = "电力功率因数预测结果查询") - Map<String,List<Object[]>> getElectricPredictData(String itemCode); - @GetMapping("/schedule-data/last") @Operation(summary = "调度模型最新结果查询") - String getLastScheduleData(String scheduleCode); + List<StScheduleRecordVO> getLastScheduleData(@RequestParam("scheduleCode") String scheduleCode,@RequestParam("limit") Integer limit); - @GetMapping("/machineRealTimeStatus") - @Operation(summary = "发电机组实时状态查询") - List<Map<String, Object>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines); + @PostMapping("/predict-data/itemNo") + @Operation(summary = "查询时间范围内预测结果") + Map<String,List<Object[]>> getPredictDataItemNo(@RequestBody PreDataItemNoReqVO reqVO); } \ No newline at end of file -- Gitblit v1.9.3