From 470fd283ee7b12852e6be573408e251c5b793365 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 六月 2025 10:19:48 +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 |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 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 d694f7a..0c4b252 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.MdkPredictDataDTO;
 import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO;
 import com.iailab.module.model.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
@@ -36,7 +37,7 @@
     PreDataBarLineRespVO getPreDataCharts(@RequestBody PreDataBarLineReqVO reqVO);
 
     @PostMapping(PREFIX + "/predict-data/item-chart")
-    @Operation(summary = "预测数据图表")
+    @Operation(summary = "预测数据图表-预测项首页图表")
     PreDataItemChartRespVO getPreDataItemChart(@RequestBody PreDataItemChartReqVO reqVO);
 
     @PostMapping(PREFIX + "/predict-data/single-chart")
@@ -71,9 +72,9 @@
     @Operation(summary = "添加调度建议")
     Boolean createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto);
 
-    @GetMapping(PREFIX + "/schedule-suggest/list")
+    @PostMapping(PREFIX + "/schedule-suggest/list")
     @Operation(summary = "获取调度建议列表")
-    List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestParam Map<String, Object> params);
+    List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestBody ScheduleSuggestReqDTO vo);
 
     @PostMapping(PREFIX + "/predict-model-setting/modify")
     @Operation(summary = "修改预测模型设置参数")
@@ -95,7 +96,7 @@
     @Operation(summary = "图表配置列表")
     List<ChartParamDTO> getChartParamList(@RequestParam("chartCode") String chartCode);
 
-    @PostMapping(PREFIX + "/alarm-suggest/page")
+    @PostMapping(value = PREFIX + "/alarm-suggest/page", consumes = "application/json;charset=UTF-8")
     @Operation(summary = "获取预警信息和调度建议分页列表")
     PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO);
 
@@ -123,4 +124,73 @@
     @Operation(summary = "添加电价时段配置列表")
     Boolean createElectricityPrice(@RequestBody List<ElectricityPriceSegmentedDTO> list);
 
+    @GetMapping(PREFIX + "/schedule/model/setting/update")
+    @Operation(summary = "修改调度模型配置")
+    Boolean updateScheduleModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value);
+
+    @GetMapping(PREFIX + "/alarm-config/update")
+    @Operation(summary = "修改预警配置")
+    Boolean updateAlarmConfig(@RequestParam("alarmObj")String alarmObj, @RequestParam("upperLimit")String upperLimit, @RequestParam("lowerLimit")String lowerLimit);
+
+    @PostMapping(PREFIX + "/chart/param/update")
+    @Operation(summary = "修改图表参数配置")
+    Boolean updateChartParam(@RequestBody ChartDTO chartDTO);
+
+    @GetMapping(PREFIX + "/item/output/itemId")
+    @Operation(summary = "获取")
+    MmItemOutputDTO getItemOutputByItemid(@RequestParam("itemid") String itemid, @RequestParam("resultstr")String resultstr, @RequestParam("resultIndex")String resultIndex);
+
+
+    @PostMapping(PREFIX + "/item/result")
+    @Operation(summary = "获取")
+    List<Object[]> getItemResult(@RequestBody PreItemResultReqVO reqVO);
+
+    @GetMapping(PREFIX + "/predict-item/itemNo")
+    @Operation(summary = "获取")
+    PredictItemVO getPredictItemByItemNo(@RequestParam("itemNo") String itemNo);
+
+    @PostMapping(PREFIX + "/item/result/last-point")
+    @Operation(summary = "获取")
+    List<Object[]> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO);
+
+    @PostMapping(PREFIX + "/schedule-suggest/use-suggest")
+    @Operation(summary = "采纳建议")
+    Boolean useSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);
+
+    @PostMapping(PREFIX + "/schedule-suggest/cancel-use-suggest")
+    @Operation(summary = "取消采纳建议")
+    Boolean cancelUseSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);
+
+    @PostMapping(PREFIX + "/schedule-suggest/ignore-suggest")
+    @Operation(summary = "忽略建议")
+    Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO);
+
+    @GetMapping(PREFIX + "/schedule-suggest/last-one")
+    @Operation(summary = "获取15分钟内最新预警建议信息")
+    List<ScheduleSuggestRespDTO> getLastSuggest(@RequestParam Map<String, Object> params);
+
+    @PostMapping(PREFIX + "/predict-data/time-value")
+    @Operation(summary = "根据预测时间获取最后预测值")
+    Map<String, BigDecimal> getPredictValueByTime(@RequestBody PredictLastValueReqVO reqVO);
+
+    @PostMapping(PREFIX + "/predict-data/tn-value")
+    @Operation(summary = "根据预测时间获取T+N预测值")
+    List<MdkPredictDataDTO> getPredictTnValue(PredictTnValueReqVO reqVO);
+
+    @GetMapping(PREFIX + "/predict/model/setting/update")
+    @Operation(summary = "修改预测模型配置")
+    Boolean updatePredictModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value);
+
+    @PostMapping(PREFIX + "/schedule-suggest/operation_record/save")
+    @Operation(summary = "保存建议操作记录")
+    Boolean saveSuggestOperationRecord(@RequestBody SuggestOperationRecordReqVO reqVO);
+
+    @GetMapping(PREFIX + "/suggest/snapshot/getAllChartData")
+    @Operation(summary = "根据建议id获取建议快照全部图表数据")
+    List<StSuggestSnapshotRecordRespVO> getSuggestSnapshotAllChartData(@RequestParam("suggestId") String suggestId);
+
+    @PostMapping(PREFIX + "/suggest/snapshot/conf-det/update-by-ext1")
+    @Operation(summary = "根据ext1修改快照配置上下限")
+    Boolean updateSuggestSnapshotConfDetByExt1(@RequestBody StSuggestSnapshotConfDetSaveReqVO updateReqVO);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3