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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 79e2d5b..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.*;
@@ -13,14 +12,13 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
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
@@ -80,9 +78,27 @@
return CommonResult.success(respVO);
}
+ @PostMapping("/plan-data/single-chart")
+ @Operation(summary = "预测数据图表")
+ public CommonResult<PlanDataSingleChartRespVO> getPlanDataSingleChart(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody PreDataSingleChartReqVO reqVO) throws Exception {
+ apiSecurityUtils.validate(request);
+ PlanDataSingleChartRespVO respVO = mcsApi.getPlanDataSingleChart(reqVO);
+ 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 = "导出预测数据")
- @ApiAccessLog(operateType = EXPORT)
public void exportPointValue(@RequestParam("itemId") String itemId,
@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime,
@@ -92,13 +108,13 @@
reqVO.setItemId(itemId);
try {
if (startTime == "") {
- reqVO.setStartTime(new Date((new Date()).getTime() - 60*60*1000));
+ reqVO.setStartTime(new Date((new Date()).getTime() - 60 * 60 * 1000));
} else {
reqVO.setStartTime(formatter.parse(startTime));
}
if (endTime == "") {
- reqVO.setEndTime(new Date((new Date()).getTime() + 60*60*1000));
+ reqVO.setEndTime(new Date((new Date()).getTime() + 60 * 60 * 1000));
} else {
reqVO.setEndTime(formatter.parse(endTime));
}
@@ -107,10 +123,34 @@
}
PreDataItemChartRespVO respVO = mcsApi.getPreDataItemChart(reqVO);
try {
- String sheetTitle = "sheet1";
+ String sheetTitle = "sheet1";
ExcelUtil.exportchart(sheetTitle, respVO, response);
} catch (Exception ex) {
ex.printStackTrace();
}
}
+
+ @GetMapping("/alarm-message/last-one")
+ @Operation(summary = "根据监控对象获取最新预警信息")
+ public CommonResult<AlarmMessageRespDTO> getLastAlarmMessage(HttpServletResponse response, HttpServletRequest
+ request, @RequestParam("alarmObj") String alarmObj) {
+ AlarmMessageRespDTO data = mcsApi.getLastAlarmMessage(alarmObj);
+ return CommonResult.success(data);
+ }
+
+ @GetMapping("/schedule-suggest/last-limit")
+ @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-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