Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269

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

@@ -29,6 +29,8 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.dto.CategoryLabelDTO;
import org.springblade.modules.category.service.ICategoryLabelService;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -94,6 +96,9 @@

   @Autowired
   private ICategoryLabelService iCategoryLabelService;

   @Autowired
   private ICommunityService communityService;


   @Override
@@ -774,4 +779,32 @@
      }
      return null;
   }

   /**
    * 社区数据处理
    * @return
    */
   @Override
   public Object communityDataHandle() {
      // 查询所有的社区差值
      List<DoorplateAddressEntity> doorplateAddressEntities = baseMapper.getAllCommunityList();
      // 遍历，插入库
      for (DoorplateAddressEntity doorplateAddressEntity : doorplateAddressEntities) {
         QueryWrapper<CommunityEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name",doorplateAddressEntity.getNeiName())
            .eq("code",doorplateAddressEntity.getNeiCode())
            .eq("is_deleted",0);
         CommunityEntity one = communityService.getOne(queryWrapper);
         if (null==one){
            // 插入
            CommunityEntity communityEntity = new CommunityEntity();
            communityEntity.setCode(doorplateAddressEntity.getNeiCode());
            communityEntity.setName(doorplateAddressEntity.getNeiName());
            communityEntity.setStreetCode(doorplateAddressEntity.getTownStreetCode().replaceAll("0+$", ""));
            //新增操作
            communityService.save(communityEntity);
         }
      }
      return null;
   }
}