From d7cb7b413ca2388a213b6a0e574e02a967cf8fe9 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 九月 2024 08:41:32 +0800
Subject: [PATCH] 历史告警
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 081ed68..c49198c 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -72,10 +72,13 @@
if(dto.getEndTime()!=null){
sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
}
- if(dto.getDevType()!=0){
+ if(dto.getDevType()!=null){
sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
}
- if(dto.getAlmId()!=0){
+ if(dto.getDevId()!=null){
+ sql+=" and dev_id="+dto.getDevId();
+ }
+ if(dto.getAlmId()!=null){
sql+=" and alm_id="+dto.getAlmId();
}
sql+=" and dev_id in (" +
@@ -113,10 +116,13 @@
if(dto.getEndTime()!=null){
sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
}
- if(dto.getDevType()!=0){
+ if(dto.getDevType()!=null){
sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
}
- if(dto.getAlmId()!=0){
+ if(dto.getDevId()!=null){
+ sql+=" and dev_id="+dto.getDevId();
+ }
+ if(dto.getAlmId()!=null){
sql+=" and alm_id="+dto.getAlmId();
}
sql+=" and dev_id in (" +
--
Gitblit v1.9.1