From e7a52d9e21eddb8ff94fb2b0ac95e4d7da541ed2 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 六月 2025 17:22:40 +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 | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 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 d498e79..b369341 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
@@ -13,7 +13,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -96,7 +95,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);
@@ -141,15 +140,52 @@
MmItemOutputDTO getItemOutputByItemid(@RequestParam("itemid") String itemid, @RequestParam("resultstr")String resultstr, @RequestParam("resultIndex")String resultIndex);
- @GetMapping(PREFIX + "/item/result")
+ @PostMapping(PREFIX + "/item/result")
@Operation(summary = "获取")
- List<Object[]> getItemResult(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat);
+ List<Object[]> getItemResult(@RequestBody PreItemResultReqVO reqVO);
@GetMapping(PREFIX + "/predict-item/itemNo")
@Operation(summary = "获取")
PredictItemVO getPredictItemByItemNo(@RequestParam("itemNo") String itemNo);
- @GetMapping(PREFIX + "/item/result/last-point")
+ @PostMapping(PREFIX + "/item/result/last-point")
@Operation(summary = "获取")
- List<Object[]> getItemResultLastPoint(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat);
+ 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);
+
+ @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