zhongrj
2024-03-22 897e74e2ce13d7a97981e4c61b18f944df9c8de8
房屋绑定数据处理修改
2 files modified
52 ■■■■ changed files
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java 51 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -800,6 +800,21 @@
                        houseEntity.setUpdateTime(new Date());
                        // 设置来源 1:地址总表  2:国控采集
                        houseEntity.setSource(1);
                        // 根据位置设置网格,警格编号
                        String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
                        //点坐标解析网格
                        List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                        if (gridEntityList.size()>0){
                            GridEntity gridEntity = gridEntityList.get(0);
                            houseEntity.setGridId(gridEntity.getId());
                            houseEntity.setGridCode(gridEntity.getGridCode());
                        }
                        //点坐标解析警格
                        List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
                        if (policeAffairsGridEntityList.size()>0){
                            PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
                            houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
                        }
                        // 加入集合
                        houseList.add(houseEntity);
                    }
@@ -891,6 +906,21 @@
                placeEntity.setIsNine(2);
                // 默认为现场采集
                placeEntity.setIsScene(1);
                // 根据位置设置网格,警格编号
                String point = "'POINT(" + addressEntity.getX() + " " + addressEntity.getY() + ")'";
                //点坐标解析网格
                List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                if (gridEntityList.size()>0){
                    GridEntity gridEntity = gridEntityList.get(0);
                    placeEntity.setGridId(gridEntity.getId());
                    placeEntity.setGridCode(gridEntity.getGridCode());
                }
                //点坐标解析警格
                List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
                if (policeAffairsGridEntityList.size()>0){
                    PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
                    placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
                }
                // 加入集合
//                    placeList.add(placeEntity);
                // 保存
@@ -1065,14 +1095,21 @@
                    wrapper.eq("house_code", doorplateAddressEntity.getAddressCode());
                    GridRangeEntity one = gridRangeService.getOne(wrapper);
                    if (null == one) {
                        GridRangeEntity gridRangeEntity = new GridRangeEntity();
                        gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                        gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
                        gridRangeEntity.setBuilding(doorplateAddressEntity.getBuildingCode());
                        // 设置网格
                        setGridInfo(doorplateAddressEntity,gridRangeEntity);
                        // 加入集合
                        gridRangeEntityList.add(gridRangeEntity);
                        String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
                        //点坐标解析网格
                        List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                        if (gridEntityList.size()>0){
                            GridRangeEntity gridRangeEntity = new GridRangeEntity();
                            gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                            gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
                            gridRangeEntity.setBuilding(doorplateAddressEntity.getBuildingCode());
                            GridEntity gridEntity = gridEntityList.get(0);
                            gridRangeEntity.setGridId(gridEntity.getId());
                            gridRangeEntity.setGridCode(gridEntity.getGridCode());
                            // 加入集合
                            gridRangeEntityList.add(gridRangeEntity);
                        }
                    }
                }
                // 批量插入
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -803,7 +803,6 @@
        <if test="type == 2">
            and jw_grid_code is null
        </if>
        and create_time > '2024-03-20 11:00:00'
    </select>
    <!--按房屋标签统计-->