From 38d9c95058d449fca8ab314d04a32672f285c607 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 20 Jul 2021 23:52:59 +0800
Subject: [PATCH] 巡逻任务接口修改
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index bdf36db..78c215c 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -750,22 +750,29 @@
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
<select id="getAlarmNumber" resultType="java.lang.Integer">
(select ifnull(count(*),0) number from sys_alarm
- where securityId =#{alarm.securityId}
- or (securityId = "" or securityId IS NULL)
+ where alarmType = '巡逻任务' and
+ (securityId =#{alarm.securityId}
+ or securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ )
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
- where securityId = "" or securityId IS NULL
+ where alarmType = '巡逻任务' and
+ (securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ )
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
- where securityId =#{alarm.securityId} and jtype = 2)
+ where alarmType = '巡逻任务' and
+ securityId =#{alarm.securityId} and jtype = 2)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
- where securityId =#{alarm.securityId} and jtype = 1)
+ where
+ alarmType = '巡逻任务' AND
+ securityId =#{alarm.securityId} and jtype = 1)
</select>
@@ -810,32 +817,31 @@
<!--获取巡逻数量的集合,全部，未处理，已处理的数量-->
<select id="getPatrolNumber" resultType="java.lang.Integer">
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = "巡逻任务" AND
+ where alarmType = '巡逻任务' AND
(securityId =#{alarm.securityId}
or securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = "巡逻任务" AND
+ where alarmType = '巡逻任务' AND
(securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
where
- alarmType = "巡逻任务" AND
+ alarmType = '巡逻任务' AND
securityId =#{alarm.securityId} and jtype = 2)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
where
- alarmType = "巡逻任务" AND
+ alarmType = '巡逻任务' AND
securityId =#{alarm.securityId} and jtype = 1)
+
</select>
<update id="setAlarm">
--
Gitblit v1.9.3