From 3058865fa4dfa634a92b4ebd826d8b1264dc90a3 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 05 三月 2025 15:04:41 +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 |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 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 6f6d219..9a57522 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
@@ -36,7 +36,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 +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 = "修改预测模型设置参数")
@@ -107,19 +107,28 @@
     @Operation(summary = "获取最后预测值")
     Map<String, BigDecimal> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO);
 
-    @GetMapping("/predict-data/electric")
-    @Operation(summary = "电力功率因数预测结果查询")
-    Map<String,List<Object[]>> getElectricPredictData(String itemCode);
-
     @GetMapping("/schedule-data/last")
     @Operation(summary = "调度模型最新结果查询")
     List<StScheduleRecordVO> getLastScheduleData(@RequestParam("scheduleCode") String scheduleCode,@RequestParam("limit") Integer limit);
 
-    @GetMapping("/machineRealTimeStatus")
-    @Operation(summary = "发电机组实时状态查询")
-    List<Map<String, Object>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines);
-
     @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);
+
+    @GetMapping(PREFIX + "/schedule/adjust/config-list")
+    @Operation(summary = "获取模拟调整配置")
+    List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(@RequestParam("modelId") String modelId);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3