小区数据处理调整

zhongrj

2024-05-13 f3b6086bbc70660d64afc7290d783b540fa8cfd4

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

@@ -882,17 +882,18 @@
            // 加入集合
            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);
         }
//         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);
//         }
      }
      // 批量插入
//      districtService.saveBatch(aoiList);
@@ -995,7 +996,21 @@
      List<String> list = new ArrayList<>();
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO doorplateAddressVO = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      // 创建数组
      String[] schoolName = {"幼儿园", "小学", "中学", "高中", "大专", "学校"};
      List<String> stringList = new ArrayList<>(Arrays.asList(schoolName));
      if (null != doorplateAddressVO) {
         if (Strings.isNotBlank(doorplateAddressVO.getAoiName()) && stringList.stream()
            .anyMatch(doorplateAddressVO.getAoiName()::contains)) {
            doorplateAddressVO.setAddressLevel(1);
            doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
         }
         if (Strings.isNotBlank(doorplateAddressVO.getPoi()) && stringList.stream()
            .anyMatch(doorplateAddressVO.getPoi()::contains)) {
            doorplateAddressVO.setAddressLevel(1);
            doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
         }

         // 不限制
         doorplateAddressVO.setIsJur(1);
         String roleName = SpringUtils.getRequestParam("roleName");
@@ -1048,7 +1063,7 @@
            PlacePoiLabel placePoiLabel = poiLabelService.getOne(Wrappers.<PlacePoiLabel>lambdaQuery()
               .eq(PlacePoiLabel::getPlaceId, doorplateAddressVO.getPid())
               .eq(PlacePoiLabel::getType, CommonConstant.NUMBER_THREE));
            if(ObjectUtil.isNotEmpty(placePoiLabel)){
            if (ObjectUtil.isNotEmpty(placePoiLabel)) {
               doorplateAddressVO.setLableCode(placePoiLabel.getPoiCode());
            }
         }