From 6bc54b7c414c8e097c6a5638dfe5b66f3c99b6dc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 21 May 2021 16:29:09 +0800
Subject: [PATCH] 海康视频播放
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index c4061ba..7ed85f2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -39,6 +39,7 @@
<result column="baname" property="baname"/>
<result column="baid" property="baid"/>
<result column="baphone" property="baphone"/>
+ <result column="manufacturers" property="manufacturers"/>
</resultMap>
<!-- 通用查询映射结果 -->
@@ -71,13 +72,13 @@
and a.galarmPeople like concat('%',#{alarm.galarmPeople},'%')
</if>
<if test="alarm.district!=null">
- and a.district like concat('%',#{alarm.district},'%')
+ and e.district like concat('%',#{alarm.district},'%')
</if>
<if test="alarm.province!=null">
- and a.province like concat('%',#{alarm.province},'%')
+ and e.province like concat('%',#{alarm.province},'%')
</if>
<if test="alarm.city!=null">
- and a.city like concat('%',#{alarm.city},'%')
+ and e.city like concat('%',#{alarm.city},'%')
</if>
<if test="alarm.level!=null">
and a.level like concat('%',#{alarm.level},'%')
@@ -205,8 +206,8 @@
<select id="selectAlarmPage" resultMap="alarmResultMap">
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,a.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ 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,
@@ -214,6 +215,7 @@
e.twoId,
e.threeId,
e.deptId,
+ e.manufacturers,
e.street as place,
e.channelNumber,
u.name as baname,
@@ -233,7 +235,7 @@
<select id="listAll" resultMap="alarmResultMap">
select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
- a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,a.vaddress
+ a.deviceNumber,a.region,e.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,a.vaddress
from sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
</select>
@@ -253,7 +255,7 @@
a.deviceNumber,
a.vaddress,
a.region,
- a.district,
+ e.district,
a.alarmId,
a.czTime,
a.bz,
@@ -341,9 +343,9 @@
a.waringType,
a.deviceNumber,
a.region,
- a.district,
- a.province,
- a.city,
+ e.district,
+ e.province,
+ e.city,
a.alarmId,
a.rname,
a.LEVEL,
@@ -397,9 +399,9 @@
<select id="selectListSe" resultMap="alarmResultMap">
SELECT
- a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
- a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,"一键求助" as 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,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
e.oneId,
@@ -592,8 +594,8 @@
<select id="getAlarm" resultMap="alarmResultMap">
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,a.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ 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,
@@ -609,7 +611,7 @@
WHERE
<if test="alarm.securityArr!=null and alarm.securityArr!=''">
- securityId IS NULL
+ securityId = "" or securityId IS NULL
AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
</if>
@@ -623,8 +625,8 @@
<select id="getAlarming" resultMap="alarmResultMap">
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,a.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
+ 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,
@@ -647,7 +649,7 @@
</update>
<update id="updateVaddress">
- update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
+ update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
<update id="updateAaddress">
@@ -721,9 +723,9 @@
<!--查询符合条件的数据并导出-->
<select id="exportAlarm" resultType="org.springblade.common.entity.AlarmExcel">
select
- a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
- a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,
+ a.id, "一键求助" as alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,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,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone
from sys_alarm a
LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
@@ -737,9 +739,16 @@
<!--获取实时警情图表统计数据-->
<select id="getAlarmPie" resultType="org.springblade.common.entity.ReportReturnData">
- select if(1=1,"紧急求救",0) type,ifnull(count(*),0) count from sys_alarm
+ select if(1=1,"一键求助",0) type,ifnull(count(*),0) count from sys_alarm
where waringType="紧急求救"
<include refid="alarmConditionPie"></include>
</select>
+ <!--查询未处理及处理中的警情总数量-->
+ <select id="selectEqCount" resultType="Integer">
+ SELECT ifnull(count(*),0) count FROM `sys_alarm`
+ where deviceNumber = #{deviceNumber}
+ and jtype!=2
+ </select>
+
</mapper>
--
Gitblit v1.9.3