From 456d96aecc44d7e7d88bbc21e8eb6575181a61ad Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 22 Jun 2021 20:56:48 +0800
Subject: [PATCH] 1.app 当前保安对应警情列表接口合并 2.取证上报(意见反馈)page 自定义类别接口修改合并
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 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 82b7d99..efc8c38 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -645,6 +645,78 @@
</select>
+ <sql id="getAlarmListSqlParam">
+ 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,e.jd,e.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
+ </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="getAlarmList" resultMap="alarmResultMap">
+ <include refid="getAlarmListSqlParam"/>
+ <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>
+ </select>
+
+ <!--获取警情数量的集合,全部,未处理,已处理的数量-->
+ <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
+ and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+
+ union
+ (select ifnull(count(*),0) number from sys_alarm
+ where securityId = "" or securityId IS NULL
+ and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+
+ union
+ (select ifnull(count(*),0) number from sys_alarm
+ where securityId =#{alarm.securityId} and jtype = 2)
+ </select>
+
<update id="setAlarm">
update sys_alarm SET securityId=#{alarm.securityId} where id=#{alarm.id}
</update>
--
Gitblit v1.9.3