From 8ec364949c81cf421cc98d3bbad6848ab032e14e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 04 Aug 2023 16:02:45 +0800
Subject: [PATCH] 日志输出修改
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 43 ++++++++++++++++++-------------------------
1 files changed, 18 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 78c215c..67fbd9f 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -482,9 +482,9 @@
) a
left join
(
- select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
+ select DATE_FORMAT(time,'%Y-%m-%d') as datetime, count(*) as count from sys_taskqd
where 1=1
- group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
+ group by DATE_FORMAT(time,'%Y-%m-%d')
) b
on
a.click_date = b.datetime
@@ -717,12 +717,12 @@
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
@@ -750,29 +750,22 @@
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
<select id="getAlarmNumber" 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 (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 (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 =#{alarm.securityId} and jtype = 2)
+ where securityId =#{alarm.securityId} and jtype = 2)
- UNION all
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = '巡逻任务' AND
- securityId =#{alarm.securityId} and jtype = 1)
+ where securityId =#{alarm.securityId} and jtype = 1)
</select>
@@ -780,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
@@ -818,15 +811,15 @@
<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
+ ((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 alarmType = '巡逻任务' AND
- (securityId = "" or securityId IS NULL
+ ((securityId = "" or securityId IS NULL)
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
)
--
Gitblit v1.9.3