From 16abd944c4331a31e99c28564c9b8a31bfbbfefc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 21:14:15 +0800
Subject: [PATCH] 海康设备接口调用工具类修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 12 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 ef8ce01..997d27b 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
@@ -38,7 +38,11 @@
<result column="securityId" property="securityId"/>
<result column="baname" property="baname"/>
<result column="baid" property="baid"/>
+ <result column="deviceName" property="deviceName"/>
<result column="baphone" property="baphone"/>
+ <result column="manufacturers" property="manufacturers"/>
+ <result column="alarmlb" property="alarmlb"/>
+ <result column="alarmbs" property="alarmbs"/>
</resultMap>
<!-- 通用查询映射结果 -->
@@ -60,6 +64,9 @@
<sql id="alarmCondition">
<if test="alarm.id!=null">
and a.id = #{alarm.id}
+ </if>
+ <if test="alarm.alarmbs!=null">
+ and a.alarmbs = #{alarm.alarmbs}
</if>
<if test="alarm.jtype!=null">
and a.jtype like concat('%',#{alarm.jtype},'%')
@@ -207,13 +214,14 @@
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,
+ a.securityArr,a.securityId,a.alarmlb,a.alarmbs,
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.manufacturers,
e.street as place,
e.channelNumber,
u.name as baname,
@@ -229,6 +237,191 @@
ORDER BY
a.jtype ASC,
a.alarmTime DESC
+ </select>
+
+ <select id="selectazPage" resultMap="alarmResultMap">
+ SELECT
+ *
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+ <if test="alarm.district!=null">
+ and district like concat('%',#{alarm.district},'%')
+ </if>
+ <if test="alarm.province!=null">
+ and province like concat('%',#{alarm.province},'%')
+ </if>
+ <if test="alarm.city!=null">
+ and city like concat('%',#{alarm.city},'%')
+ </if>
+ <if test="alarm.alarmPeople!=null">
+ and alarmPeople like concat('%',#{alarm.alarmPeople},'%')
+ </if>
+ <if test="alarm.jtype!=null">
+ and jtype = #{alarm.jtype}
+ </if>
+ AND waringType IN ( "安装任务" )
+ ORDER BY
+ jtype ASC,
+ alarmTime DESC
+ </select>
+
+ <select id="getChartData" resultType="java.util.Map">
+ SELECT
+ COUNT( * ) AS value,
+ "未安装" as name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND jtype = 0
+ AND waringType IN ( "安装任务" ) UNION ALL
+ SELECT
+ COUNT( * ) AS value,
+ "已安装" as name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND jtype = 2
+ AND waringType IN ( "安装任务" )
+ </select>
+ <select id="getChartDataAlarm" resultType="java.util.Map">
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "未处理" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND jtype = 0
+ AND waringType IN ( "紧急求救" ) UNION ALL
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "处理中" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND jtype = 1
+ AND waringType IN ( "紧急求救" )
+ UNION ALL
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "已处理" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND jtype = 2
+ AND waringType IN ( "紧急求救" )
+ </select>
+ <select id="getChartDataAlarmBs" resultType="java.util.Map">
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "一般警情" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND alarmbs = 0
+ AND waringType IN ( "紧急求救" ) UNION ALL
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "误报警情" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND alarmbs = 1
+ AND waringType IN ( "紧急求救" )
+ UNION ALL
+ SELECT
+ COUNT( * ) AS
+ value
+ ,
+ "严重警情" AS name
+ FROM
+ sys_alarm
+ WHERE
+ 1 = 1
+
+ <if test="beginTime!=null and beginTime!=''">
+ and alarmTime>=#{beginTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and alarmTime<=#{endTime}
+ </if>
+
+ AND alarmbs = 2
+ AND waringType IN ( "紧急求救" )
</select>
<select id="listAll" resultMap="alarmResultMap">
@@ -406,6 +599,8 @@
e.twoId,
e.threeId,
e.deptId,
+ a.alarmlb,
+ e.manufacturers,
e.channelNumber,
jfpth.blade_region.`name` as addvnm
FROM
@@ -434,8 +629,12 @@
,bz=#{bz}
</if>
- <if test="securityArr!=null and id!=''">
+ <if test="securityArr!=null and securityArr!=''">
,securityArr =#{securityArr}
+ </if>
+
+ <if test="bs!=null and bs!=''">
+ ,alarmbs =#{bs}
</if>
where id=#{id}
@@ -599,23 +798,25 @@
e.stype,
e.oneId,
e.twoId,
+ e.deviceName,
e.threeId,
e.deptId,
e.street as place,
e.channelNumber
FROM
- sys_alarm a
- LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
+ sys_alarm a
+ LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
WHERE
- <if test="alarm.securityArr!=null and alarm.securityArr!=''">
- securityId IS NULL
- AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
- </if>
+ <if test="alarm.securityArr!=null and alarm.securityArr!=''">
+ (securityId = "" or securityId IS NULL)
+ AND jtype != 2
+ AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
+ </if>
- <if test="alarm.id!=null and alarm.id!=''">
- a.id = #{alarm.id}
- </if>
+ <if test="alarm.id!=null and alarm.id!=''">
+ a.id = #{alarm.id}
+ </if>
</select>
@@ -631,6 +832,7 @@
e.oneId,
e.twoId,
e.threeId,
+ e.deviceName,
e.deptId,
e.street as place,
e.channelNumber
@@ -721,7 +923,8 @@
<!--查询符合条件的数据并导出-->
<select id="exportAlarm" resultType="org.springblade.common.entity.AlarmExcel">
select
- a.id, "一键求助" as alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
+ 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
--
Gitblit v1.9.3