From 82614438a300523cc13e22b6d175586a3ec8ed71 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 15:46:04 +0800
Subject: [PATCH] 电池告警实时和历史
---
src/main/java/com/whyc/service/SubTableService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index d446bc7..ae4e32e 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -58,7 +58,10 @@
//鐢垫睜鍛婅鍘嗗彶瀹炴椂璁＄畻姣忓紶琛ㄦ煡璇㈡�绘暟
public int getBattHisCount(BattAlarmHistory battAlarmHistory) {
String sql="SELECT count(*) as number FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
- " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ " where 1=1" ;
+ if (battAlarmHistory.getAlmLevel()!=null){
+ sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
+ }
if(battAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
@@ -87,7 +90,10 @@
//鐢垫睜鍛婅鍘嗗彶瀹炴椂
public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) {
String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
- " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ " where 1=1";
+ if(battAlarmHistory.getAlmLevel()!=null){
+ sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
+ }
if(battAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
@@ -102,7 +108,7 @@
while (rs.next()){
BattAlarmHistory data=new BattAlarmHistory();
data.setNum(rs.getInt("num"));
- data.setBinfId(rs.getInt("binf_id"));
+ data.setBattGroupId(rs.getInt("binf_id"));
data.setAlmStartTime(rs.getTimestamp("alm_start_time"));
data.setAlmEndTime(rs.getTimestamp("alm_end_time"));
data.setMonNum(rs.getInt("mon_num"));
--
Gitblit v1.9.1