From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 729c468..1deb278 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
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -97,7 +98,23 @@
@Operation(summary = "获取预警信息和调度建议分页列表")
PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO);
- /*@PostMapping(PREFIX + "/predict-data/last-value")
+ @PostMapping(PREFIX + "/predict-data/doubleValue")
+ @Operation(summary = "获取多个预测项Double类型数据")
+ Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO);
+
+ @PostMapping(PREFIX + "/predict-data/last-value")
@Operation(summary = "获取最后预测值")
- Double getPredictLastValue();*/
+ 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);
+
+ @GetMapping("/machineRealTimeStatus")
+ @Operation(summary = "发电机组实时状态查询")
+ List<Map<String, Object>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines);
}
\ No newline at end of file
--
Gitblit v1.9.3