From 52281b73bed8dd8ac631cb2657deb8e5e7d9b1fd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 24 Jun 2021 19:06:19 +0800
Subject: [PATCH] app警情列表修改
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 efc8c38..0867835 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -667,17 +667,37 @@
</sql>
<!--查询当前保安所有警情信息-->
+<!-- <select id="getAllAlarmList" resultMap="alarmResultMap">-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId = "" or securityId IS NULL-->
+<!-- AND securityArr LIKE concat('%',#{alarm.securityId},'%')-->
+<!-- order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- </select>-->
+
+ <!--查询当前保安所有警情信息-->
<select id="getAllAlarmList" resultMap="alarmResultMap">
- (select * from (
- <include refid="getAlarmListSqlParam"/>
- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
- )a)
- union
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId = "" or securityId IS NULL
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
+ )a)
+ union
+ (select * from (
+ <include refid="getAlarmListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
union
(select * from (
@@ -698,6 +718,10 @@
and securityId =#{alarm.securityId} and jtype = 2
order by alarmTime desc
</if>
+ <if test="alarm.status==4">
+ and securityId =#{alarm.securityId} and jtype = 1
+ order by alarmTime desc
+ </if>
</select>
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
@@ -715,6 +739,10 @@
union
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId} and jtype = 2)
+
+ union
+ (select ifnull(count(*),0) number from sys_alarm
+ where securityId =#{alarm.securityId} and jtype = 1)
</select>
<update id="setAlarm">
--
Gitblit v1.9.3