From 9904da747fbf3d5c3746f351620f038392e3684b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 12 一月 2025 21:13:48 +0800
Subject: [PATCH] 预警列表
---
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java | 6 ++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAlarmMessageService.java | 5 +++++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/AlarmConfigReqDTO.java | 3 ---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java | 8 ++++++++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 4 ++++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/enums/CommonConstant.java | 2 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 6 ++++++
7 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
index 0858715..729c468 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -96,4 +96,8 @@
@PostMapping(PREFIX + "/alarm-suggest/page")
@Operation(summary = "获取预警信息和调度建议分页列表")
PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO);
+
+ /*@PostMapping(PREFIX + "/predict-data/last-value")
+ @Operation(summary = "获取最后预测值")
+ Double getPredictLastValue();*/
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/AlarmConfigReqDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/AlarmConfigReqDTO.java
index 657f56f..fa40ee2 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/AlarmConfigReqDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/AlarmConfigReqDTO.java
@@ -1,10 +1,7 @@
package com.iailab.module.model.api.mcs.dto;
-import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
import java.io.Serializable;
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
index 96d9e11..07a1d40 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
@@ -84,6 +84,9 @@
@Schema(description = "预测平均值")
private BigDecimal preAvg;
+ @Schema(description = "预测最后一个值")
+ private BigDecimal preLast;
+
@Schema(description = "预测累计值")
private BigDecimal preCumulant;
@@ -104,4 +107,7 @@
@Schema(description = "调整值")
private List<Object[]> adjData;
+
+ @Schema(description = "预警信息")
+ private List<AlarmMessageRespDTO> alarmeList;
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/enums/CommonConstant.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/enums/CommonConstant.java
index 21c5e66..9a35f21 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/enums/CommonConstant.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/enums/CommonConstant.java
@@ -32,6 +32,8 @@
String ITEM_CODE = "ITEM_CODE";
+ String ALARM_OBJ = "ALARM_OBJ";
+
String PLAN_ITEM_LIST = "PLAN_ITEM_LIST";
String RESULT_STR = "RESULT_STR";
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index fcf9866..cf9ea58 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -367,6 +367,12 @@
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
+ if (StringUtils.isNotBlank(alarmObj)) {
+ List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+ dataView.setAlarmeList(alarmList);
+ }
+
result.setPredictTime(predictTime);
result.setStartTime(startTime);
result.setEndTime(endTime);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAlarmMessageService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAlarmMessageService.java
index 5512dde..e809416 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAlarmMessageService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAlarmMessageService.java
@@ -6,6 +6,9 @@
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessagePageReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
+import java.util.Date;
+import java.util.List;
+
/**
* @author PanZhibao
* @Description
@@ -19,6 +22,8 @@
MmPredictAlarmMessageEntity getLast(String alarmObj);
+ List<MmPredictAlarmMessageEntity> getList(String alarmObj, Date alarmTime);
+
void create(MmPredictAlarmMessageSaveReqVO reqVO);
void update(MmPredictAlarmMessageSaveReqVO reqVO);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
index 1f55917..33790c6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
@@ -46,6 +46,14 @@
}
@Override
+ public List<MmPredictAlarmMessageEntity> getList(String alarmObj, Date alarmTime) {
+ QueryWrapper<MmPredictAlarmMessageEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("alarm_obj", alarmObj)
+ .eq("alarm_time", alarmTime);
+ return baseDao.selectList(queryWrapper);
+ }
+
+ @Override
public void create(MmPredictAlarmMessageSaveReqVO reqVO) {
MmPredictAlarmMessageEntity entity = BeanUtils.toBean(reqVO, MmPredictAlarmMessageEntity.class);
entity.setId(UUID.randomUUID().toString());
--
Gitblit v1.9.3