From b7f39248b0791d489ed0b60e411668c054be35ff Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Feb 2024 16:02:45 +0800
Subject: [PATCH] 判断采集是否现场采集补充

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 50 insertions(+), 4 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 958ba7e..51ea714 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -186,9 +186,6 @@
                         #{code}
                     </foreach>
                 </when>
-                <otherwise>
-                    and jg.grid_code in ('')
-                </otherwise>
             </choose>
         </if>
         order by jp.create_time desc,jp.id desc
@@ -235,9 +232,32 @@
     </update>
 
     <!--查询场所详情数据-->
+    <!--查询场所详情数据-->
     <select id="getDetail" resultMap="detailMap">
         select
-        jp.*,
+        jp.id,
+        jp.house_code,
+        jp.building_code,
+        jp.principal_user_id,
+        jp.principal,
+        jp.principal_phone,
+        jp.principal_id_card,
+        jp.place_name,
+        if(jp.source=1,jda.x,jp.lng) as lng,
+        if(jp.source=1,jda.y,jp.lat) as lat,
+        if(jp.source=1,jda.address_name,jp.location) as location,
+        jp.image_urls,
+        jp.grid_id,
+        jp.grid_code,
+        jp.jw_grid_code,
+        jp.source,
+        jp.status,
+        jp.is_scene,
+        jp.is_nine,
+        jp.nine_type,
+        jp.is_front,
+        jp.front_type,
+        jp.remark,
         bu.real_name as username,bu.phone as phone,
         jppl.id as plid,
         jppl.place_id,
@@ -253,6 +273,7 @@
         left join jczz_category jc on jc.category_no = jppl.poi_code
         left join jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
         left join blade_region br on br.code = jg.community_code
+        left join jczz_doorplate_address jda on jda.address_code = jp.house_code
         where jp.is_deleted = 0
         <if test="place.houseCode!=null and place.houseCode!=''">
             and jp.house_code like concat('%',#{place.houseCode},'%')
@@ -571,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
+        ) &lt;= 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
+        ) &lt;= 1
+    </select>
+
 </mapper>

--
Gitblit v1.9.3