Merge remote-tracking branch 'origin/master'

linwei

2024-02-03 c50cce7ac8e4b0d1cd1d35feedfe479180ac03ae

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -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
        ) &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>

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -218,6 +218,8 @@
            if (policeAffairsGridEntities.size() > 0) {
                // 设置警务网格并更新
                placeVO.setJwGridCode(policeAffairsGridEntities.get(0).getJwGridCode());
                // 更新
                updateById(placeVO);
            }
        }
    }