From 231897591c909b164defebfdb5936387ec2807d0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 28 十一月 2024 11:10:10 +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 |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 b80ba25..039e10b 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
@@ -40,6 +40,10 @@
     @Operation(summary = "预测数据图表")
     PreDataSingleChartRespVO getPreDataSingleChart(@RequestBody PreDataSingleChartReqVO reqVO);
 
+    @PostMapping(PREFIX + "/predict-data/cur")
+    @Operation(summary = "获取当前预测数据")
+    Map<String, List<Object[]>> getPreDataCur(PreDataJsonReqVO reqVO);
+
     @PostMapping(PREFIX + "/plan-data/single-chart")
     @Operation(summary = "计划数据图表")
     PlanDataSingleChartRespVO getPlanDataSingleChart(@RequestBody PreDataSingleChartReqVO reqVO);
@@ -50,7 +54,11 @@
 
     @GetMapping(PREFIX + "/alarm-message/list")
     @Operation(summary = "获取预警信息列表")
-    List<AlarmMessageRespDTO> listAlarmMessage(@RequestParam Map<String, Object> params);
+    List<AlarmMessageRespDTO> listAlarmMessage(@RequestParam("params") Map<String, Object> params);
+
+    @GetMapping(PREFIX + "/alarm-config/list")
+    @Operation(summary = "获取预警配置列表")
+    List<AlarmConfigRespDTO> listAlarmConfig(@RequestParam("params") Map<String, Object> params);
 
     @GetMapping(PREFIX + "/alarm-message/last-one")
     @Operation(summary = "获取最新预警信息")
@@ -60,14 +68,19 @@
     @Operation(summary = "添加调度建议")
     Boolean createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto);
 
-    @GetMapping(PREFIX + "/schedule-suggest/last-limit")
+    @GetMapping(PREFIX + "/schedule-suggest/list")
     @Operation(summary = "获取调度建议列表")
-    List<ScheduleSuggestRespDTO> getLastLimitScheduleSuggest(@RequestParam("scheduleObj") String scheduleObj, @RequestParam("limit") Integer limit);
+    List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestParam("params") ScheduleSuggestReqDTO params);
 
     @PostMapping(PREFIX + "/predict-model-setting/modify")
     @Operation(summary = "修改预测模型设置参数")
     Boolean modifyPredictModelSetting(@RequestBody List<PredictModelSettingReqDTO> dtos);
 
+    @GetMapping(PREFIX + "/schedule-suggest/last-limit")
+    @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);

--
Gitblit v1.9.3