From 8aadcbe920f02806b9fa363b386d3d6c693c5c56 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 07 二月 2025 16:49:03 +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 |   26 ++++++++++++++++++++++++--
 1 files changed, 24 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 4a263aa..3bd1bf7 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.StScheduleRecordVO;
 import com.iailab.module.model.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -70,9 +71,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 = "修改预测模型设置参数")
@@ -105,4 +106,25 @@
     @PostMapping(PREFIX + "/predict-data/last-value")
     @Operation(summary = "获取最后预测值")
     Map<String, BigDecimal> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO);
+
+    @GetMapping("/schedule-data/last")
+    @Operation(summary = "调度模型最新结果查询")
+    List<StScheduleRecordVO> getLastScheduleData(@RequestParam("scheduleCode") String scheduleCode,@RequestParam("limit") Integer limit);
+
+    @PostMapping("/predict-data/itemNo")
+    @Operation(summary = "查询时间范围内预测结果")
+    Map<String,List<Object[]>> getPredictDataItemNo(@RequestBody PreDataItemNoReqVO reqVO);
+
+    @GetMapping(PREFIX + "/electricityPrice/list")
+    @Operation(summary = "电价时段配置列表")
+    List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam("year") String year, @RequestParam("time") String time);
+
+    @PostMapping(PREFIX + "/electricityPrice/create")
+    @Operation(summary = "添加电价时段配置列表")
+    Boolean createElectricityPrice(@RequestBody List<ElectricityPriceSegmentedDTO> list);
+
+    @PostMapping(PREFIX + "/schedule/model/setting/update")
+    @Operation(summary = "修改调度模型配置")
+    Boolean updateScheduleModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3