From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml
index 9e4c93d..d664e47 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml
@@ -27,9 +27,24 @@
<result column="type" property="type"/>
</resultMap>
-
- <select id="selectSecurityPage" resultMap="securityResultMap">
- select * from sys_security where is_deleted = 0
+ <!--自定义分页-->
+ <select id="selectSecurityPage" resultMap="securityResultMaps">
+ SELECT s.*,p.jd,p.wd,ST_ASTEXT(e.coordinate) as coordinate
+ FROM sys_security s
+ LEFT JOIN sys_position p
+ on p.snumber=s.snumber
+ LEFT JOIN sys_enclosure e
+ on e.anumber=s.snumber
+ where 1=1
+ <if test="security.sname!=null and security.sname !=''">
+ <bind name="sname" value="'%'+security.sname+'%'"/>
+ and s.sname like #{sname}
+ </if>
+ <if test="security.snumber!=null">
+ <bind name="snumber" value="'%'+security.snumber+'%'"/>
+ and s.snumber like #{snumber}
+ </if>
+ order by s.snumber asc
</select>
<select id="selectList" resultMap="securityResultMaps">
--
Gitblit v1.9.3