From 0a2b23ad3f30dfb01c5d590fb98f39e93bfe1932 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:35:17 +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 |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 41b12ec..cc50c48 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
@@ -1,6 +1,5 @@
 package com.iailab.module.model.api.controller.admin;
 
-import com.iailab.framework.apilog.core.annotation.ApiAccessLog;
 import com.iailab.framework.common.pojo.CommonResult;
 import com.iailab.module.model.api.mcs.McsApi;
 import com.iailab.module.model.api.mcs.dto.*;
@@ -19,8 +18,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-
-import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import java.util.Map;
 
 /**
  * @author PanZhibao
@@ -89,6 +87,16 @@
         return CommonResult.success(respVO);
     }
 
+    @PostMapping("/predict-data/cur")
+    @Operation(summary = "获取当前预测数据")
+    public CommonResult<Map<String, List<Object[]>>> getPreDataCur(HttpServletResponse response, HttpServletRequest
+            request, @RequestBody PreDataJsonReqVO reqVO)throws Exception {
+        apiSecurityUtils.validate(request);
+        reqVO.setPredictTime(new Date());
+        Map<String, List<Object[]>> map = mcsApi.getPreDataCur(reqVO);
+        return CommonResult.success(map);
+    }
+
     @GetMapping("/predict-data/exportValue")
     @Operation(summary = "导出预测数据")
     public void exportPointValue(@RequestParam("itemId") String itemId,
@@ -137,4 +145,12 @@
         List<ScheduleSuggestRespDTO> data = mcsApi.getLastLimitScheduleSuggest(scheduleObj, limit);
         return CommonResult.success(data);
     }
+
+    @PostMapping("/schedule-model/out")
+    @Operation(summary = "调度模型数据下发")
+    public Boolean scheduleModelOut(HttpServletResponse response, HttpServletRequest
+            request, @RequestBody MdkScheduleRespDTO dto) throws Exception {
+        apiSecurityUtils.validate(request);
+        return mcsApi.scheduleModelOut(dto);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3