From 470fd283ee7b12852e6be573408e251c5b793365 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 六月 2025 10:19:48 +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 | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 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 8197392..1575ee5 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
@@ -5,13 +5,16 @@
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.api.mdk.dto.MdkPredictDataDTO;
import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO;
import com.iailab.module.model.common.utils.ApiSecurityUtils;
import com.iailab.module.model.common.utils.ExcelUtil;
+import com.iailab.module.model.mdk.vo.DataValueVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +24,8 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -65,6 +70,53 @@
return CommonResult.success(respVO);
}
+ @PostMapping("/predict-data/missDataList")
+ @Operation(summary = "缺失历史数据表单")
+ public CommonResult<List<Map<String,Object>>> getPreDataMissDataList(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody PreDataBarLineReqVO reqVO) throws Exception {
+ apiSecurityUtils.validate(request);
+
+ PreDataBarLineRespVO respVO = new PreDataBarLineRespVO();
+ List<Map<String,Object>> result = new ArrayList<>();
+ try {
+ respVO = mcsApi.getPreDataCharts(reqVO);
+ for (int i = 0; i < respVO.getDataViewList().size()-1; i++) {
+
+ Map<String,Object> real = getMissDataMap(respVO.getDataViewList().get(i).getRealData(),respVO.getDataViewList().get(i).getOutId(),respVO.getDataViewList().get(i).getResultName()+"(真实)");
+ Map<String,Object> preN = getMissDataMap(respVO.getDataViewList().get(i).getPreDataN(),respVO.getDataViewList().get(i).getOutId(),respVO.getDataViewList().get(i).getResultName()+"(T+N)");
+ Map<String,Object> preL = getMissDataMap(respVO.getDataViewList().get(i).getPreDataL(),respVO.getDataViewList().get(i).getOutId(),respVO.getDataViewList().get(i).getResultName()+"(T+L)");
+ result.add(real);
+ result.add(preN);
+ result.add(preL);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return CommonResult.success(result);
+ }
+
+ private Map<String,Object> getMissDataMap( List<Object[]> list,String outId,String resultName){
+ Map<String,Object> missDataMap = new HashMap<>();
+
+ if (list == null || list.size() < 2) {
+ return missDataMap;
+ }
+ for (int i = 1; i < list.size(); i++) {
+ LocalDateTime startTime = (LocalDateTime) list.get(i-1)[0];
+ LocalDateTime endTime = (LocalDateTime) list.get(i)[0];
+ long gap = ChronoUnit.MINUTES.between(startTime, endTime);
+ if (gap > 10) {
+ missDataMap.put("outId",outId);
+ missDataMap.put("resultName",resultName);
+ missDataMap.put("startTime",startTime);
+ missDataMap.put("endTime",endTime);
+ missDataMap.put("random",10);
+ missDataMap.put("gap",gap);
+ }
+ }
+ return missDataMap;
+ }
+
@PostMapping("/predict-data/item-chart")
@Operation(summary = "预测数据图表")
public CommonResult<PreDataItemChartRespVO> getPreDataItemChart(HttpServletResponse response, HttpServletRequest
@@ -102,6 +154,13 @@
return CommonResult.success(map);
}
+ @PostMapping("/predict-data/tn-value")
+ @Operation(summary = "获取T+N预测数据")
+ public CommonResult<List<MdkPredictDataDTO>> getPredictTnValue(PredictTnValueReqVO reqVO) {
+ List<MdkPredictDataDTO> list = mcsApi.getPredictTnValue(reqVO);
+ return success(list);
+ }
+
@GetMapping("/predict-data/exportValue")
@Operation(summary = "导出预测数据")
public void exportPointValue(@RequestParam("itemId") String itemId,
@@ -113,13 +172,13 @@
reqVO.setItemId(itemId);
try {
if (startTime == "") {
- reqVO.setStartTime(new Date((new Date()).getTime() - 60 * 60 * 1000));
+ reqVO.setStartTime(null);
} else {
reqVO.setStartTime(formatter.parse(startTime));
}
if (endTime == "") {
- reqVO.setEndTime(new Date((new Date()).getTime() + 60 * 60 * 1000));
+ reqVO.setEndTime(null);
} else {
reqVO.setEndTime(formatter.parse(endTime));
}
@@ -268,4 +327,58 @@
List<Object[]> list = mcsApi.getItemResultLastPoint(reqVO);
return CommonResult.success(list);
}
+
+ @GetMapping("/schedule-suggest/last-one")
+ @Operation(summary = "获取15分钟内最新预警建议信息")
+ public CommonResult<List<ScheduleSuggestRespDTO>> getLastSuggest(@RequestParam Map<String, Object> params) {
+ List<ScheduleSuggestRespDTO> data = mcsApi.getLastSuggest(params);
+ return CommonResult.success(data);
+ }
+
+ @GetMapping("/predict/model/setting/update")
+ @Operation(summary = "修改调度模型配置")
+ public CommonResult<Boolean> updatePredictModelSetting(@RequestParam("modelCode") String modelCode, @RequestParam("key") String key, @RequestParam("value") String value){
+ mcsApi.updatePredictModelSetting(modelCode, key, value);
+ return success( true);
+ }
+
+ @PostMapping("/schedule-suggest/use-suggest")
+ @Operation(summary = "采纳建议")
+ public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO){
+ mcsApi.useSuggest(reqVO);
+ return success( true);
+ }
+
+ @PostMapping("/schedule-suggest/cancel-use-suggest")
+ @Operation(summary = "取消采纳建议")
+ public CommonResult<Boolean> cancelUseSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO){
+ mcsApi.cancelUseSuggest(reqVO);
+ return success( true);
+ }
+
+ @PostMapping(value = "/schedule-suggest/operation_record/save", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(summary = "保存建议操作记录")
+ public CommonResult<Boolean> saveSuggestOperationRecord(@RequestBody SuggestOperationRecordReqVO reqVO){
+ mcsApi.saveSuggestOperationRecord(reqVO);
+ return success( true);
+ }
+
+ @PostMapping("/schedule-suggest/ignore-suggest")
+ @Operation(summary = "取消采纳建议")
+ public CommonResult<Boolean> ignoreSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO){
+ mcsApi.ignoreSuggest(reqVO);
+ return success( true);
+ }
+
+ @GetMapping("/suggest/snapshot/getAllChartData")
+ @Operation(summary = "根据建议id获取建议快照全部图表数据")
+ public CommonResult<List<StSuggestSnapshotRecordRespVO>> getSuggestSnapshotAllChartData(@RequestParam("suggestId") String suggestId){
+ return success( mcsApi.getSuggestSnapshotAllChartData(suggestId));
+ }
+
+ @PostMapping("/suggest/snapshot/conf-det/update-by-ext1")
+ @Operation(summary = "根据ext1修改快照配置上下限")
+ public CommonResult<Boolean> updateSuggestSnapshotConfDetByExt1(@RequestBody StSuggestSnapshotConfDetSaveReqVO updateReqVO) {
+ return success(mcsApi.updateSuggestSnapshotConfDetByExt1(updateReqVO));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3