From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 10 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 6d5ad03..67fbd9f 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
@@ -480,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
@@ -666,6 +668,27 @@
1=1
</sql>
+ <sql id="getPatrolListSqlParam">
+ select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
+ a.deviceNumber,a.region,e.district,a.vaddress,a.aaddress,
+ a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
+ a.securityArr,a.securityId,
+ e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
+ e.stype,
+ e.oneId,
+ e.twoId,
+ e.threeId,
+ e.deptId,
+ e.deviceName,
+ a.place as place,
+ e.channelNumber
+ FROM
+ sys_alarm a
+ LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
+ WHERE
+ 1=1 AND a.alarmType = "巡逻任务"
+ </sql>
+
<!--查询当前保安所有警情信息-->
<!-- <select id="getAllAlarmList" resultMap="alarmResultMap">-->
<!-- (select * from (-->
@@ -690,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
@@ -710,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>
@@ -727,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
@@ -745,6 +768,75 @@
where securityId =#{alarm.securityId} and jtype = 1)
</select>
+
+ <!--查询当前保安所有巡逻信息-->
+ <select id="getAllPatrolList" resultMap="alarmResultMap">
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and ((securityId = "" or securityId IS NULL)
+ AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ order by alarmTime desc limit 9999
+ )a)
+ union all
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
+ )a)
+ union all
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999
+ )a)
+ </select>
+
+ <!--查询当前保安需要处理和未处理的巡逻信息-->
+ <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},'%')
+ order by alarmTime desc
+ </if>
+ <if test="alarm.status==3">
+ 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>
+
+ <!--获取巡逻数量的集合,全部，未处理，已处理的数量-->
+ <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)
+ and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ )
+
+ UNION all
+ (select ifnull(count(*),0) number from sys_alarm
+ where alarmType = '巡逻任务' AND
+ ((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 =#{alarm.securityId} and jtype = 2)
+
+ UNION all
+ (select ifnull(count(*),0) number from sys_alarm
+ where
+ alarmType = '巡逻任务' AND
+ securityId =#{alarm.securityId} and jtype = 1)
+
+ </select>
+
<update id="setAlarm">
update sys_alarm SET securityId=#{alarm.securityId} where id=#{alarm.id}
</update>
--
Gitblit v1.9.3