From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 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 d10dec7..f5fb719 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
@@ -7,6 +7,7 @@
 import com.iailab.module.model.api.mcs.dto.*;
 import com.iailab.module.model.common.utils.ApiSecurityUtils;
 import com.iailab.module.model.common.utils.ExcelUtil;
+import com.iailab.module.model.influxdb.vo.InfluxModelResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -17,6 +18,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -170,4 +172,29 @@
         Map<String, Map<String,Double>> map = mcsApi.getPreDoubleData(reqVO);
         return CommonResult.success(map);
     }
+
+    @PostMapping("/predict-data/last-value")
+    @Operation(summary = "获取最后预测值")
+    public CommonResult<Map<String, BigDecimal>> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO) {
+        Map<String, BigDecimal> data = mcsApi.getPredictLastValue(reqVO);
+        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<String> getLastScheduleData(@RequestParam String scheduleCode) {
+        return CommonResult.success(mcsApi.getLastScheduleData(scheduleCode));
+    }
+
+    @PostMapping("/machineRealTimeStatus")
+    @Operation(summary = "发电机组实时状态查询")
+    CommonResult<List<Map<String, Object>>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines) {
+        return CommonResult.success(mcsApi.getRealTimeStatus(machines));
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3