From 60e664bd398e908206d00eb8e17c3b4796c70df1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 24 三月 2025 18:42:33 +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 |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 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 3bd1bf7..fcb8ff0 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,6 +13,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -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")
@@ -123,8 +124,32 @@
     @Operation(summary = "添加电价时段配置列表")
     Boolean createElectricityPrice(@RequestBody List<ElectricityPriceSegmentedDTO> list);
 
-    @PostMapping(PREFIX + "/schedule/model/setting/update")
+    @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);
 }
\ No newline at end of file

--
Gitblit v1.9.3