From a2639f069f6a38672ff6c8c51f11f216a92bae35 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 6 Mar 2024 14:27:36 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=91=8A=E8=AD=A6=E6=95=B0=E9=87=8Fbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java index 862cbe0..2b54abb 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java @@ -135,6 +135,11 @@ public class AlarmServiceImpl extends BaseServiceImpl if(!StringUtil.isEmpty(alarm.getAlarmType())){ wrapper.eq("ALARM_TYPE",alarm.getAlarmType()); } + // 处理告警过滤 ：当天处理告警 + List handles = alarmHandleService.handles(); + if(!CollectionUtil.isEmpty(handles)){ + wrapper.notIn("ALARM_ID",handles); + } // 查询告警数据 List alarms = this.list(wrapper); // 查询数量