From 69269100c2d0018fcd6a37e3ee2c95fac56d5689 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 16:47:41 +0800
Subject: [PATCH] 电源告警实时和历史
---
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | 6 +++++-
src/main/java/com/whyc/service/SubTableService.java | 9 +++++----
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java | 3 +++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
index 367fac4..1df4513 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -52,7 +52,11 @@
@TableField(exist = false)
@ApiModelProperty("鐢垫睜缁勫悕绉�")
- private String binfName;
+ private String battGroupName;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢垫簮鍚嶇О")
+ private String powerName;
@TableField(exist = false)
@ApiModelProperty("琛ㄥ悕瀛楁嫾鎺�")
diff --git a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
index f742d15..3fad888 100644
--- a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
@@ -59,6 +59,9 @@
private Integer almLevel;
@TableField(exist = false)
+ private String powerName;
+
+ @TableField(exist = false)
@ApiModelProperty("琛ㄥ悕瀛楁嫾鎺�")
private String recordYear;
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index 11dddcd..dafca62 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -89,8 +89,7 @@
}
//鐢垫睜鍛婅鍘嗗彶瀹炴椂
public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) {
- String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
- " where 1=1";
+ String sql="SELECT history.*,power_inf.power_name,power_inf.binf_name as battGroupName FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history,db_batt.power_inf where history.binf_id=power_inf.binf_id ";
if(battAlarmHistory.getAlmLevel()!=null){
sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
}
@@ -115,6 +114,8 @@
data.setAlmId(rs.getInt("alm_id"));
data.setAlmLevel(rs.getInt("alm_level"));
data.setAlmValue(rs.getInt("alm_value"));
+ data.setPowerName(rs.getString("power_name"));
+ data.setBattGroupName(rs.getString("battGroupName"));
list.add(data);
}
return list;
@@ -157,8 +158,7 @@
}
//鐢垫簮鍛婅鍘嗗彶瀹炴椂
public List<PowerAlarmHistory> getPowerHisList(PowerAlarmHistory powerAlarmHistory) {
- String sql="SELECT * FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history " +
- " where 1=1";
+ String sql="SELECT history.*,power_inf.power_name FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history,db_batt.power_inf where history.power_id = power_inf.power_id ";
if(powerAlarmHistory.getAlmLevel()!=null){
sql+= " and history.alm_level="+ powerAlarmHistory.getAlmLevel();
}
@@ -182,6 +182,7 @@
data.setAlmId(rs.getInt("alm_id"));
data.setAlmLevel(rs.getInt("alm_level"));
data.setAlmValue(rs.getInt("alm_value"));
+ data.setPowerName(rs.getString("power_name"));
list.add(data);
}
return list;
--
Gitblit v1.9.1