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 |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 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 eb7f98a..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
@@ -275,6 +275,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 0
             AND waringType IN ( "安装任务" ) UNION ALL
         SELECT
@@ -284,6 +292,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 2
             AND waringType IN ( "安装任务" )
     </select>
@@ -297,6 +313,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 0
             AND waringType IN ( "紧急求救" ) UNION ALL
         SELECT
@@ -308,6 +332,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 1
             AND waringType IN ( "紧急求救" )
             UNION ALL
@@ -320,6 +352,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 2
             AND waringType IN ( "紧急求救" )
     </select>
@@ -333,6 +373,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 0
             AND waringType IN ( "紧急求救" ) UNION ALL
         SELECT
@@ -344,6 +392,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 1
             AND waringType IN ( "紧急求救" )
             UNION ALL
@@ -356,6 +412,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 2
             AND waringType IN ( "紧急求救" )
     </select>
@@ -745,7 +809,8 @@
         WHERE
 
         <if test="alarm.securityArr!=null and alarm.securityArr!=''">
-            securityId = "" or securityId IS NULL
+            (securityId = "" or securityId IS NULL)
+            AND jtype != 2
             AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
         </if>
 

--
Gitblit v1.9.3