From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 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 1e484a3..dd58302 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -41,6 +41,7 @@
<result column="baphone" property="baphone"/>
<result column="deviceName" property="deviceName"/>
<result column="manufacturers" property="manufacturers"/>
+ <result column="xllx" property="xllx"/>
</resultMap>
<!-- 通用查询映射结果 -->
@@ -219,7 +220,8 @@
e.manufacturers,
a.place as place,
e.channelNumber,
- u.name as baname,
+ a.xllx,
+ u.real_name as baname,
u.id as baid,
u.phone as baphone
from sys_alarm a
@@ -711,16 +713,16 @@
<select id="getAllAlarmList" resultMap="alarmResultMap">
(select * from (
<include refid="getAlarmListSqlParam"/>
- and securityId = "" or securityId IS NULL
+ and (securityId = "" or securityId IS NULL)
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999
@@ -731,7 +733,7 @@
<select id="getAlarmList" resultMap="alarmResultMap">
<include refid="getAlarmListSqlParam"/>
<if test="alarm.status==2">
- and securityId = "" or securityId IS NULL
+ and (securityId = "" or securityId IS NULL)
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc
</if>
@@ -748,13 +750,13 @@
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
<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 (securityId =#{alarm.securityId}
+ or securityId = "" or securityId IS NULL)
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
UNION ALL
(select ifnull(count(*),0) number from sys_alarm
- where securityId = "" or securityId IS NULL
+ where (securityId = "" or securityId IS NULL)
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
UNION ALL
@@ -771,16 +773,16 @@
<select id="getAllPatrolList" resultMap="alarmResultMap">
(select * from (
<include refid="getPatrolListSqlParam"/>
- and (securityId = "" or securityId IS NULL
+ and ((securityId = "" or securityId IS NULL)
AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
order by alarmTime desc limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getPatrolListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getPatrolListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999
@@ -791,8 +793,8 @@
<select id="getPatrolList" resultMap="alarmResultMap">
<include refid="getPatrolListSqlParam"/>
<if test="alarm.status==2">
- and (securityId = "" or securityId IS NULL
- AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ and (securityId = "" or securityId IS NULL)
+ AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc
</if>
<if test="alarm.status==3">
@@ -808,32 +810,31 @@
<!--获取巡逻数量的集合,全部，未处理，已处理的数量-->
<select id="getPatrolNumber" resultType="java.lang.Integer">
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = "巡逻任务" AND
- (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
- alarmType = "巡逻任务" AND
- (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
- 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