From 0809aa554fc906e73a383c34f88bb4153bb69b00 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 14 一月 2025 14:24:08 +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 | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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..d10dec7 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,7 +1,8 @@
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.framework.common.pojo.PageResult;
+import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
import com.iailab.module.model.common.utils.ApiSecurityUtils;
@@ -19,8 +20,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Map;
-import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.iailab.framework.common.pojo.CommonResult.success;
/**
* @author PanZhibao
@@ -89,6 +91,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 +149,25 @@
List<ScheduleSuggestRespDTO> data = mcsApi.getLastLimitScheduleSuggest(scheduleObj, limit);
return CommonResult.success(data);
}
+
+ @PostMapping("/alarm-suggest/page")
+ @Operation(summary = "获取预警信息和调度建议分页列表")
+ public CommonResult<PageResult<StAlarmAndSuggestRespVO>> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO) {
+ PageResult<StAlarmAndSuggestRespVO> page = mcsApi.getAlarmAndSuggestPage(reqVO);
+ return success(BeanUtils.toBean(page, StAlarmAndSuggestRespVO.class));
+ }
+
+ @GetMapping("/chart/param/list")
+ @Operation(summary = "图表配置列表")
+ public CommonResult<List<ChartParamDTO>> getChartParamList(@RequestParam("chartCode") String chartCode) {
+ List<ChartParamDTO> chartParamList = mcsApi.getChartParamList(chartCode);
+ return CommonResult.success(chartParamList);
+ }
+
+ @PostMapping("/predict-data/doubleValue")
+ @Operation(summary = "获取多个预测项Double类型数据")
+ public CommonResult<Map<String, Map<String,Double>>> getPreDoubleData(@RequestBody PreDoubleDataReqVO reqVO) {
+ Map<String, Map<String,Double>> map = mcsApi.getPreDoubleData(reqVO);
+ return CommonResult.success(map);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3