Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

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

@@ -712,9 +712,9 @@
    * @return
    */
   @Override
   public Object houseDataHandle() {
   public Object houseDataHandle(String townName) {
      // 处理房屋数据
      handleHouseData();
      handleHouseData(townName);

      return null;
   }
@@ -722,9 +722,14 @@
   /**
    * 处理房屋数据
    */
   private void handleHouseData() {
   private void handleHouseData(String townName) {
      // 查询总数
      Integer count = baseMapper.getNotHouseListCount(townName);
      if (count>0) {
         int num = count/1000;
         for (int i = 0; i <= num+1; i++) {
      // 查询所有户室数据（未入库的）
      List<DoorplateAddressEntity> list = baseMapper.getHouseList();
            List<DoorplateAddressEntity> list = baseMapper.getHouseList(townName);
      // 需要新增的房屋 list
      List<HouseEntity> houseList = new ArrayList<>();
      // 处理户室数据
@@ -739,7 +744,10 @@
            houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
            houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
            houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
                  houseEntity.setLng(doorplateAddressEntity.getX());
                  houseEntity.setLat(doorplateAddressEntity.getY());
            houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
                  houseEntity.setAddress(doorplateAddressEntity.getAddressName());
            houseEntity.setFloor(doorplateAddressEntity.getFloor());
            houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
            houseEntity.setUnit(doorplateAddressEntity.getUnitName());
@@ -757,6 +765,9 @@
      }
      // 批量插入
      houseService.saveBatch(houseList);
         }
      }

   }

   /**
@@ -790,6 +801,16 @@
            // 加入集合
            districtService.save(districtEntity);
//            aoiList.add(districtEntity);
         }else {
            // 更新
            one.setCommunityCode(addressEntity.getNeiCode());
            one.setAoiCode(addressEntity.getAoiCode());
            one.setName(addressEntity.getAoiName());
            one.setAddress(addressEntity.getAddressName());
            one.setLng(addressEntity.getX());
            one.setLat(addressEntity.getY());
            // 加入集合
            districtService.updateById(one);
         }
      }
      // 批量插入
@@ -827,6 +848,8 @@
               placeEntity.setStatus(1);
               // 默认为非九小场所
               placeEntity.setIsNine(2);
               // 默认为现场采集
               placeEntity.setIsScene(1);
               // 加入集合
//               placeList.add(placeEntity);
               // 保存