From aae9bc1ebc7f65cebaec65ac7128f79ca6c827d1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 07 Feb 2024 10:24:39 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 187979f..7da6da5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -28,8 +28,8 @@
left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
- LEFT JOIN jczz_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
left join (
select a.* from jczz_place_poi_label a inner join
(
@@ -103,19 +103,16 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone,
- jda.address_name,
+ bus.phone AS policePhone,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
- LEFT JOIN jczz_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
@@ -141,7 +138,7 @@
and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.deptName!=null and place.deptName!=''">
- and bd.dept_name like concat('%',#{place.deptName},'%')
+ and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
<if test="place.policeName!=null and place.policeName!=''">
@@ -150,6 +147,10 @@
<if test="place.nineType!=null and place.nineType!=''">
and jp.nine_type = #{place.nineType}
+ </if>
+
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -197,6 +198,7 @@
jp.house_code houseCode,
jp.place_name AS NAME,
jp.is_nine AS isNine,
+ jp.is_front AS isFront,
br.name neiName,
FALSE AS hasChildren
FROM jczz_place jp
@@ -431,19 +433,16 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone,
- jda.address_name,
- bd.dept_name
+ bus.phone AS policePhone,
+ IFNULL(jda.address_name,jp.location) addressName,
+ jpag.pcs_name deptName
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
- LEFT JOIN jczz_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN blade_dept bd on bd.id = bus.dept_id
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
@@ -469,7 +468,7 @@
and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.deptName!=null and place.deptName!=''">
- and bd.dept_name like concat('%',#{place.deptName},'%')
+ and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
<if test="place.policeName!=null and place.policeName!=''">
@@ -478,6 +477,10 @@
<if test="place.nineType!=null and place.nineType!=''">
and jp.nine_type = #{place.nineType}
+ </if>
+
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -514,9 +517,6 @@
#{code}
</foreach>
</when>
- <otherwise>
- and jg.grid_code in ('')
- </otherwise>
</choose>
</if>
order by jp.create_time desc,jp.id desc
@@ -592,4 +592,29 @@
and jw_grid_code is null
</select>
+ <!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
+ <select id="comparisonPosition" resultType="java.lang.Integer">
+ select count(1) from jczz_doorplate_address where 1=1
+ and (
+ ACOS(
+ SIN(
+ ( #{place.y} * 3.1415 )/ 180 ) * SIN(( y * 3.1415 )/ 180 )
+ + COS(( #{place.y} * 3.1415 )/ 180 ) * COS(( y * 3.1415 )/ 180 ) * COS(( #{place.x} * 3.1415 )/ 180
+ - ( x * 3.1415 )/ 180 ))* 6370.996
+ ) <= 1
+ and address_code = #{place.houseCode}
+ </select>
+
+
+ <!--比对两点间的距离是否在1km 范围内 (和采集的位置对比)-->
+ <select id="comparisonPositionNotHouseCode" resultType="java.lang.Boolean">
+ select (
+ ACOS(
+ SIN(
+ ( #{place.y} * 3.1415 )/ 180 ) * SIN(( #{place.lat} * 3.1415 )/ 180 )
+ + COS(( #{place.y} * 3.1415 )/ 180 ) * COS(( #{place.lat} * 3.1415 )/ 180 ) * COS(( #{place.x} * 3.1415 )/ 180
+ - ( #{place.lng} * 3.1415 )/ 180 ))* 6370.996
+ ) <= 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3