From ca120d70593f7a29a150bb6fb17f8ff4cdfadbc8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 19 三月 2025 11:31:27 +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, 25 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 9a57522..d498e79 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;
@@ -123,12 +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 + "/schedule/adjust/config-list")
- @Operation(summary = "获取模拟调整配置")
- List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(@RequestParam("modelId") String modelId);
+ @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);
+
+
+ @GetMapping(PREFIX + "/item/result")
+ @Operation(summary = "获取")
+ List<Object[]> getItemResult(@RequestParam("outputid") String outputid, @RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("timeFormat") String timeFormat);
+
+ @GetMapping(PREFIX + "/predict-item/itemNo")
+ @Operation(summary = "获取")
+ PredictItemVO getPredictItemByItemNo(@RequestParam("itemNo") String itemNo);
+
+ @GetMapping(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);
}
\ No newline at end of file
--
Gitblit v1.9.3