From 0e9232080ecf8caadbb7712dc914d00823760842 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 六月 2025 15:10:31 +0800
Subject: [PATCH] 历史告警加入告警对应关系名字
---
src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java | 3 +++
src/main/java/com/whyc/service/SubTablePageInfoService.java | 1 +
src/main/java/com/whyc/service/AlarmHisService.java | 32 ++++++++++++++++++++------------
src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java | 3 +++
src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java | 3 +++
5 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java
index 60cf932..2be847b 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "鐢垫睜鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绫诲瀷")
private Integer almSignalId;
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java b/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
index a96765f..a11e48a 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java
index 5d1abb3..51fd478 100644
--- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java
@@ -38,6 +38,9 @@
@ApiModelProperty(value = "鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
diff --git a/src/main/java/com/whyc/service/AlarmHisService.java b/src/main/java/com/whyc/service/AlarmHisService.java
index 80b3964..d95b0ee 100644
--- a/src/main/java/com/whyc/service/AlarmHisService.java
+++ b/src/main/java/com/whyc/service/AlarmHisService.java
@@ -1,11 +1,18 @@
package com.whyc.service;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.BattAlarmIdEnum;
+import com.whyc.constant.BattSingalIdEnum;
+import com.whyc.constant.DevAlarmEnum;
+import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.AlmHis.BattAlmPar;
import com.whyc.dto.AlmHis.DevAlmPar;
import com.whyc.dto.AlmHis.PwrAlmPar;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
+import com.whyc.pojo.db_alarm.BattalarmDataHistory;
+import com.whyc.pojo.db_alarm.DevalarmDataHistory;
+import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmHistory;
import com.whyc.pojo.db_user.User;
import com.whyc.util.ActionUtil;
import com.whyc.util.MessageUtils;
@@ -34,14 +41,10 @@
PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfoByMonthTable(pageNum, pageSize, almStartTime, almEndTime,
"db_alarm", "tb_battalarm_data_history", almDto);
List<Object> list = pageInfo.getList();
- /*for (Object data : list) {
- AlarmRes a = (AlarmRes) data;
- List<BattalarmDataHistory> l = a.getAdataHs();
- for (BattalarmDataHistory adataH : l) {
- adataH.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adataH.getAlmSignalId()));
- adataH.setAlmLevelName(AlarmDaoFactory.getAlarmType(adataH.getAlmLevel()));
- }
- }*/
+ for (Object data : list) {
+ BattalarmDataHistory dataH = (BattalarmDataHistory) data;
+ dataH.setAlmName(BattSingalIdEnum.getValue(dataH.getAlmSignalId()));
+ }
return new Response().setII(1, list!=null, pageInfo, "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ");
}
//璁惧鍛婅鍘嗗彶璁板綍鏌ヨ
@@ -55,6 +58,11 @@
almDto.setUid(uid);
PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfoByMonthTable(pageNum, pageSize, almStartTime, almEndTime,
"db_alarm", "tb_devalarm_data_history", almDto);
+ List<Object> list = pageInfo.getList();
+ for (Object data : list) {
+ DevalarmDataHistory dataH = (DevalarmDataHistory) data;
+ dataH.setAlmName(DevAlarmEnum.getValue(dataH.getAlmId()));
+ }
return new Response().setII(1, pageInfo.getList()!=null, pageInfo, "杩斿洖缁撴灉");
}
//鐢垫簮鍛婅鍘嗗彶璁板綍鏌ヨ
@@ -71,10 +79,10 @@
PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfo(pageNum, pageSize, almStartTime, almEndTime,
"db_pwrdev_alarm", "tb_pwrdev_alarm_history", almDto);
List<Object> list = pageInfo.getList();
- /*for (Object temp : list) {
- PwrdevAlarmHistory p = (PwrdevAlarmHistory) temp;
- p.setAlarmName(AlarmDaoFactory.getAllAlarmName(p.getAlmType()));
- }*/
+ for (Object data : list) {
+ PwrdevAlarmHistory dataH = (PwrdevAlarmHistory) data;
+ dataH.setAlmName(PowerAlarmEnum.getValue(dataH.getAlmId()));
+ }
return new Response<>().setII(1, pageInfo, null, "鐢垫簮鍛婅鍘嗗彶璁板綍鏌ヨ");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 17fd08c..8e0e373 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -317,6 +317,7 @@
ph.setNum(rs.getLong("num"));
ph.setDevId(rs.getInt("dev_id"));
ph.setDevIp(rs.getString("dev_ip"));
+ ph.setAlmId(rs.getInt("alm_id"));
ph.setAlmLevel(rs.getInt("alm_level"));
ph.setAlmStartTime(rs.getTimestamp("alm_start_time"));
ph.setAlmEndTime(rs.getTimestamp("alm_end_time"));
--
Gitblit v1.9.1