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 | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 638ca65..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
@@ -1,5 +1,6 @@
package com.iailab.module.model.api.mcs;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.module.model.api.mcs.dto.*;
import com.iailab.module.model.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
@@ -10,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;
@@ -80,16 +82,39 @@
@Operation(summary = "获取调度建议列表")
List<ScheduleSuggestRespDTO> getLastLimitScheduleSuggest(@RequestParam("scheduleObj") String scheduleObj, @RequestParam("limit") Integer limit);
-
@PostMapping(PREFIX + "/schedule-model-setting/modify")
@Operation(summary = "修改调度模型设置参数")
Boolean modifyScheduleModelSetting(@RequestBody List<ScheduleModelSettingReqDTO> dtos);
- @GetMapping(PREFIX + "/schedule-model/out")
- @Operation(summary = "调度模型数据下发")
- Boolean scheduleModelOut(@RequestParam MdkScheduleRespDTO dto);
-
@GetMapping(PREFIX + "/schedule-scheme/list")
@Operation(summary = "获取调度方案列表")
- List<StScheduleSchemeDTO> listScheduleScheme(@RequestParam Map<String, Object> params);
+ List<StScheduleSchemeDTO> listScheduleScheme(@RequestParam("triggerMethod") String triggerMethod, @RequestParam("triggerCondition") String triggerCondition);
+
+ @GetMapping(PREFIX + "/chart/param/list")
+ @Operation(summary = "图表配置列表")
+ List<ChartParamDTO> getChartParamList(@RequestParam("chartCode") String chartCode);
+
+ @PostMapping(PREFIX + "/alarm-suggest/page")
+ @Operation(summary = "获取预警信息和调度建议分页列表")
+ PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO);
+
+ @PostMapping(PREFIX + "/predict-data/doubleValue")
+ @Operation(summary = "获取多个预测项Double类型数据")
+ Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO);
+
+ @PostMapping(PREFIX + "/predict-data/last-value")
+ @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);
+
+ @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