linwe
2023-12-21 0b7d27cb994b6f985953100812dc7ca0dc03c77d
Merge remote-tracking branch 'origin/master'
2 files modified
27 ■■■■■ changed files
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java 23 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -724,16 +724,19 @@
        if (list.size()>0) {
            // 将场所数据保存到场所表中
            for (DoorplateAddressEntity addressEntity : list) {
                PlaceEntity placeEntity = new PlaceEntity();
                placeEntity.setHouseCode(addressEntity.getAddressCode());
                placeEntity.setPlaceName(addressEntity.getPoi());
                placeEntity.setLng(addressEntity.getX());
                placeEntity.setLat(addressEntity.getY());
                placeEntity.setLocaltion(addressEntity.getAddressName());
                // 设置来源( 1:地址总表  2:国控采集)
                placeEntity.setSource(1);
                // 加入集合
                placeList.add(placeEntity);
                // pio 名称不为空的进行插入操作
                if (!Strings.isBlank(addressEntity.getPoi())) {
                    PlaceEntity placeEntity = new PlaceEntity();
                    placeEntity.setHouseCode(addressEntity.getAddressCode());
                    placeEntity.setPlaceName(addressEntity.getPoi());
                    placeEntity.setLng(addressEntity.getX());
                    placeEntity.setLat(addressEntity.getY());
                    placeEntity.setLocaltion(addressEntity.getAddressName());
                    // 设置来源( 1:地址总表  2:国控采集)
                    placeEntity.setSource(1);
                    // 加入集合
                    placeList.add(placeEntity);
                }
            }
            // 批量插入
            placeService.saveBatch(placeList);
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -142,11 +142,11 @@
    <!--查询小区网格绑定-->
    <select id="getGridListByAoiCode" resultType="org.springblade.modules.grid.vo.GridVO">
        SELECT jg.id,jg.grid_name from jczz_grid jg
        SELECT jg.grid_name from jczz_grid jg
        left join jczz_grid_range jgr on jg.id = jgr.grid_id
        where jg.is_deleted = 0
        and jgr.district_code = #{aoiCode}
        GROUP BY jg.id,jg.grid_name
        GROUP BY jg.grid_name
    </select>
</mapper>