zhongrj
2024-02-27 0b405425458e6d274e1533348bd5075440f60d6d
场所网格设置接口新增,场所查询修改(所属街道社区不显示问题)
7 files modified
81 ■■■■■ changed files
src/main/java/org/springblade/modules/grid/service/IGridService.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/controller/PlaceController.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 23 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/service/IPlaceService.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/service/IGridService.java
@@ -72,6 +72,11 @@
    Object spatialAnalysis(DoorplateAddressEntity addressEntity);
    /**
     * 空间分析
     */
    List<GridEntity> spatialAnalysis(String point);
    /**
     * 根据参数查询网格数据
     * @param place
     * @return
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -184,6 +184,14 @@
    }
    /**
     * 空间分析
     */
    @Override
    public List<GridEntity> spatialAnalysis(String point) {
        return baseMapper.spatialAnalysis(point);
    }
    /**
     * 根据参数查询网格数据
     * @param place
     * @return
src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -286,4 +286,12 @@
    public R placeJwGridCodeHandle() {
        return R.data(placeService.placeJwGridCodeHandle());
    }
    /**
     * 场所综治网格处理
     */
    @GetMapping("/placeGridCodeHandle")
    public R placeGridCodeHandle() {
        return R.data(placeService.placeGridCodeHandle());
    }
}
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -168,4 +168,10 @@
     * @return
     */
    Boolean comparisonPositionNotHouseCode(@Param("place") PlaceVO placeVO);
    /**
     * 查询 综治网格为空的数据
     * @return
     */
    List<PlaceEntity> getPlaceNotGridCode();
}
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -17,18 +17,20 @@
        select
        jp.*,
        jpe.id as placeExtId,
        bu.real_name as username,bu.phone as phone,
        br.town_name as townStreetName,br.name as neiName,
        jpe.confirm_flag confirmFlag,
        bu.real_name as username,
        bu.phone as phone,
        br.town_name as townStreetName,
        br.name as neiName,
        jg.grid_name as gridName,
        bus.`name` AS policeName,
        bu.phone AS policePhone
        bus.phone AS policePhone,
        jpe.confirm_flag confirmFlag
        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_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 (
        select a.* from jczz_place_poi_label a inner join
@@ -331,7 +333,6 @@
        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,
@@ -717,6 +718,7 @@
        select id,lng,lat from jczz_place where is_deleted = 0
         and source != 3
         and jw_grid_code is null
         and lng != ''
    </select>
    <!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
@@ -744,4 +746,13 @@
        ) &lt;= 1
    </select>
    <!--查询 综治网格为空的数据-->
    <select id="getPlaceNotGridCode" resultType="org.springblade.modules.place.entity.PlaceEntity">
        select id,lng,lat from jczz_place where is_deleted = 0
         and source != 3
         and grid_code is null
         and lng != ''
    </select>
</mapper>
src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -165,4 +165,9 @@
     * 场所警务网格处理
     */
    Object placeJwGridCodeHandle();
    /**
     * 场所综治网格处理
     */
    Object placeGridCodeHandle();
}
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -1343,4 +1343,30 @@
        }
        return null;
    }
    /**
     * 场所综治网格处理
     */
    @Override
    public Object placeGridCodeHandle() {
        // 查询 综治网格为空的数据
        List<PlaceEntity> list = baseMapper.getPlaceNotGridCode();
        // 遍历
        for (PlaceEntity placeEntity : list) {
            if (!Strings.isBlank(placeEntity.getLng())) {
                // 空间分析
                //点坐标解析
                String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() + ")'";
                //String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
                List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                if (gridEntityList.size() > 0) {
                    GridEntity gridEntity = gridEntityList.get(0);
                    placeEntity.setGridCode(gridEntity.getGridCode());
                    // 更新
                    updateById(placeEntity);
                }
            }
        }
        return null;
    }
}