From d0d5011558c12337410350642e8c41da211e261b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 22 一月 2025 14:53:18 +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 | 35 ++++++++++++++++++++++-------------
1 files changed, 22 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 96116e5..a4c747b 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
@@ -12,6 +12,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -20,9 +21,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -180,12 +179,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) {
@@ -195,10 +188,26 @@
return CommonResult.success(mcsApi.getLastScheduleData(scheduleCode,limit));
}
- @PostMapping("/machineRealTimeStatus")
- @Operation(summary = "发电机组实时状态查询")
- CommonResult<List<Map<String, Object>>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines) {
- return CommonResult.success(mcsApi.getRealTimeStatus(machines));
+ @PostMapping("/schedule-data/last/more")
+ @Operation(summary = "多个调度模型最新结果查询")
+ public CommonResult<Map<String,List<StScheduleRecordVO>>> getMoreLastScheduleData(@RequestBody Map<String,Object> params) {
+ if (!params.containsKey("scheduleCodes")) {
+ return success(new HashMap<>());
+ }
+ Set<String> scheduleCodes = new HashSet<>(((List<String>) params.get("scheduleCodes")));
+ if (CollectionUtils.isEmpty(scheduleCodes)) {
+ return success(new HashMap<>());
+ }
+ Integer limit = 1;
+ if (params.containsKey("limit")) {
+ limit = Integer.parseInt(params.get("limit").toString());
+ }
+
+ Map<String,List<StScheduleRecordVO>> result = new HashMap<>(scheduleCodes.size());
+ for (String scheduleCode : scheduleCodes) {
+ result.put(scheduleCode,mcsApi.getLastScheduleData(scheduleCode, limit));
+ }
+ return CommonResult.success(result);
}
@PostMapping("/predict-data/itemNo")
--
Gitblit v1.9.3