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-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
index 6d57df8..8197392 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -144,11 +144,18 @@
}
@GetMapping("/schedule-suggest/last-limit")
- @Operation(summary = "根据监控对象获取最新预警信息")
+ @Operation(summary = "根据监控对象获取最新调度建议")
public CommonResult<List<ScheduleSuggestRespDTO>> getLastLimitScheduleSuggest(HttpServletResponse response, HttpServletRequest
request, @RequestParam("scheduleObj") String scheduleObj, @RequestParam("limit") Integer limit) {
List<ScheduleSuggestRespDTO> data = mcsApi.getLastLimitScheduleSuggest(scheduleObj, limit);
return CommonResult.success(data);
+ }
+
+ @PostMapping("/schedule-suggest/list")
+ @Operation(summary = "获取调度建议")
+ public CommonResult<List<ScheduleSuggestRespDTO>> listScheduleSuggest(@RequestBody ScheduleSuggestReqDTO vo) {
+ List<ScheduleSuggestRespDTO> list = mcsApi.listScheduleSuggest(vo);
+ return CommonResult.success(list);
}
@PostMapping("/alarm-suggest/page")
@@ -179,12 +186,6 @@
return CommonResult.success(data);
}
- @GetMapping("/predict-data/electric")
- @Operation(summary = "电力功率因数预测结果查询")
- public CommonResult<Map<String,List<Object[]>>> getElectricPredictData(@RequestParam String itemCode) {
- Map<String,List<Object[]>> data = mcsApi.getElectricPredictData(itemCode);
- return CommonResult.success(data);
- }
@GetMapping("/schedule-data/last")
@Operation(summary = "调度模型最新结果查询")
public CommonResult<List<StScheduleRecordVO>> getLastScheduleData(@RequestParam String scheduleCode, @RequestParam Integer limit) {
@@ -216,15 +217,55 @@
return CommonResult.success(result);
}
- @PostMapping("/machineRealTimeStatus")
- @Operation(summary = "发电机组实时状态查询")
- CommonResult<List<Map<String, Object>>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines) {
- return CommonResult.success(mcsApi.getRealTimeStatus(machines));
- }
-
@PostMapping("/predict-data/itemNo")
@Operation(summary = "查询时间范围内预测结果")
CommonResult<Map<String,List<Object[]>>> getPredictDataItemNo(@RequestBody PreDataItemNoReqVO reqVO) {
return CommonResult.success(mcsApi.getPredictDataItemNo(reqVO));
}
+
+ @GetMapping("/electricityPrice/list")
+ @Operation(summary = "电价表")
+ public CommonResult<List<ElectricityPriceSegmentedDTO>> getElectricityPriceList(@RequestParam("year") String year, @RequestParam("time") String time) {
+ List<ElectricityPriceSegmentedDTO> electricityPriceSegmentedList = mcsApi.getElectricityPriceList(year, time);
+ return CommonResult.success(electricityPriceSegmentedList);
+ }
+
+ @GetMapping("/schedule/model/setting/update")
+ @Operation(summary = "修改调度模型配置")
+ public CommonResult<Boolean> updateScheduleModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value){
+ mcsApi.updateScheduleModelSetting(modelCode, key, value);
+ return success( true);
+ }
+
+ @GetMapping("/alarm-config/update")
+ @Operation(summary = "修改预警配置列表")
+ public CommonResult<Boolean> updateAlarmConfig(@RequestParam("alarmObj")String alarmObj, @RequestParam("upperLimit")String upperLimit, @RequestParam("lowerLimit")String lowerLimit){
+ mcsApi.updateAlarmConfig(alarmObj, upperLimit, lowerLimit);
+ return success( true);
+ }
+
+ @PostMapping("/chart/param/update")
+ @Operation(summary = "修改图表参数配置")
+ public CommonResult<Boolean> updateChartParam(@RequestBody ChartDTO chartDTO){
+ mcsApi.updateChartParam(chartDTO);
+ return success( true);
+ }
+
+ @PostMapping("/item/result")
+ public CommonResult<List<Object[]>> getItemResult(@RequestBody PreItemResultReqVO reqVO){
+ List<Object[]> list = mcsApi.getItemResult(reqVO);
+ return CommonResult.success(list);
+ }
+
+ @GetMapping("/predict-item/itemNo")
+ public CommonResult<PredictItemVO> getPredictItemByItemNo(@RequestParam("itemNo") String itemNo){
+ PredictItemVO proVo = mcsApi.getPredictItemByItemNo(itemNo);
+ return CommonResult.success(proVo);
+ }
+
+ @PostMapping("/item/result/last-point")
+ public CommonResult<List<Object[]>> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO){
+ List<Object[]> list = mcsApi.getItemResultLastPoint(reqVO);
+ return CommonResult.success(list);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3