From 8166fe4a4c8c79c72d55ee0b706ecdfcac1620a0 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 09 六月 2025 08:47:18 +0800
Subject: [PATCH] 三种告警筛选
---
src/main/resources/mapper/PwrdevAlarmMapper.xml | 14 ++++++++++----
src/main/resources/mapper/BattalarmDataMapper.xml | 14 +++++++++-----
src/main/resources/mapper/DevalarmDataMapper.xml | 13 +++++++++----
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/BattalarmDataMapper.xml b/src/main/resources/mapper/BattalarmDataMapper.xml
index 2b6ab27..7c0ed22 100644
--- a/src/main/resources/mapper/BattalarmDataMapper.xml
+++ b/src/main/resources/mapper/BattalarmDataMapper.xml
@@ -24,11 +24,15 @@
and tb_battalarm_data.alm_level=#{almLevel}
</if>
<if test="almIds!=null">
- and tb_battalarm_data.alm_id in
- <foreach collection="almIds" item="almId" open="(" separator="," close=")">
- #{almId}
- </foreach>
-
+ <if test="almIds.size==0">
+ and tb_battalarm_data.alm_id =0
+ </if>
+ <if test="almIds.size>0">
+ and tb_battalarm_data.alm_id in
+ <foreach collection="almIds" item="almId" open="(" separator="," close=")">
+ #{almId}
+ </foreach>
+ </if>
</if>
<if test="uid>100">
and tb_batt_inf.station_id in(
diff --git a/src/main/resources/mapper/DevalarmDataMapper.xml b/src/main/resources/mapper/DevalarmDataMapper.xml
index a60191a..301dc63 100644
--- a/src/main/resources/mapper/DevalarmDataMapper.xml
+++ b/src/main/resources/mapper/DevalarmDataMapper.xml
@@ -23,10 +23,15 @@
and tb_devalarm_data.alm_level=#{almLevel}
</if>
<if test="almIds!=null">
- and tb_devalarm_data.alm_id in
- <foreach collection="almIds" item="almId" open="(" separator="," close=")">
- #{almId}
- </foreach>
+ <if test="almIds.size==0">
+ and tb_devalarm_data.alm_id =0
+ </if>
+ <if test="almIds.size>0">
+ and tb_devalarm_data.alm_id in
+ <foreach collection="almIds" item="almId" open="(" separator="," close=")">
+ #{almId}
+ </foreach>
+ </if>
</if>
<if test="uid>100">
and tb_batt_inf.station_id in(
diff --git a/src/main/resources/mapper/PwrdevAlarmMapper.xml b/src/main/resources/mapper/PwrdevAlarmMapper.xml
index f853fbe..82be3f7 100644
--- a/src/main/resources/mapper/PwrdevAlarmMapper.xml
+++ b/src/main/resources/mapper/PwrdevAlarmMapper.xml
@@ -23,11 +23,17 @@
and tb_pwrdev_alarm.alm_level=#{almLevel}
</if>
<if test="almIds!=null">
- and tb_pwrdev_alarm.alm_id in
- <foreach collection="almIds" item="almId" open="(" separator="," close=")">
- #{almId}
- </foreach>
+ <if test="almIds.size==0">
+ and tb_pwrdev_alarm.alm_id =0
+ </if>
+ <if test="almIds.size>0">
+ and tb_pwrdev_alarm.alm_id in
+ <foreach collection="almIds" item="almId" open="(" separator="," close=")">
+ #{almId}
+ </foreach>
+ </if>
</if>
+
<if test="uid>100">
and tb_pwrdev_alarm.power_id in(
select distinct power_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
--
Gitblit v1.9.1