From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
index 2c6df69..8424c50 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
@@ -12,7 +12,7 @@
<select id="selectEnclosurePage" resultMap="enclosureResultMap">
- select * from sys_enclosure where is_deleted = 0
+ select * from sys_enclosure
</select>
<insert id="inserte">
@@ -20,11 +20,34 @@
</insert>
<update id="updatee">
- update sys_enclosure SET anumber=#{anumber},aname=#{aname},coordinate=ST_GeomFromText(${a}) where anumber=#{anumber}
+ update sys_enclosure SET coordinate=ST_GeomFromText(${a}) where anumber=#{anumber}
</update>
<select id="selectList" resultMap="enclosureResultMap">
SELECT id,anumber,aname,ST_ASTEXT (coordinate) AS coordinate FROM sys_enclosure
</select>
+ <!--电子围栏详情 detail-->
+ <select id="selectEnclosureDetail" resultType="org.springblade.jfpt.enclosure.entity.Enclosure">
+ SELECT id,anumber,aname,ST_ASTEXT (coordinate) AS coordinate FROM sys_enclosure
+ where 1=1
+ <if test="enclosure.anumber!=null and enclosure.anumber!='' ">
+ and anumber = #{enclosure.anumber}
+ </if>
+ </select>
+
+ <!--根据处警人员编号删除-->
+ <delete id="deleteByAnumber">
+ delete from sys_enclosure where anumber = #{anumber}
+ </delete>
+
+ <!--判断打卡点是否在电子围栏内-->
+ <select id="isOnArea" resultType="java.lang.Integer">
+ select ifnull(count(*),0) count from sys_enclosure
+ where
+ MBRWithin(ST_GeomFromText('POINT(${jd} ${wd})'),coordinate)
+ and
+ anumber=#{enclosure.anumber}
+ </select>
+
</mapper>
--
Gitblit v1.9.3