Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -26,6 +26,8 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
@@ -71,6 +73,9 @@

   @Autowired
   private IGridService gridService;

   @Autowired
   private IDistrictService districtService;


   @Override
@@ -599,4 +604,34 @@
      // 批量插入
      houseService.saveBatch(houseList);
   }

   /**
    * 小区数据处理
    * @return
    */
   @Override
   public Object aoiDataHandle() {
      // 查询所有的地址表id集合
      List<Long> aoiCodeList = baseMapper.getAoiCodeList();
      // 查询小区集合
      List<DoorplateAddressEntity> list = baseMapper.getAoiList(aoiCodeList);
      // 创建小区集合对象
      List<DistrictEntity> aoiList = new ArrayList<>();
      // 将小区数据保存到小区表中
      for (DoorplateAddressEntity addressEntity : list) {
         DistrictEntity districtEntity = new DistrictEntity();
         districtEntity.setCommunityCode(addressEntity.getNeiCode());
         districtEntity.setAoiCode(addressEntity.getAoiCode());
         districtEntity.setName(addressEntity.getAoiName());
         districtEntity.setAddress(addressEntity.getAddressName());
         districtEntity.setLng(addressEntity.getX());
         districtEntity.setLat(addressEntity.getY());
         // 加入集合
         aoiList.add(districtEntity);
      }
      // 批量插入
      districtService.saveBatch(aoiList);
      // 返回
      return null;
   }
}