bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -26,7 +26,10 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
@@ -71,6 +74,9 @@
   @Autowired
   private IGridService gridService;

   @Autowired
   private IGridRangeService gridRangeService;

   /**
    * 自定义列表查询
    * @param page
@@ -84,10 +90,25 @@
         if (place.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
            place.setCreateUser(AuthUtil.getUserId());
         }
         if (!place.getRoleName().equals("系统管理员")){
            place.setCreateUser(AuthUtil.getUserId());
         }
      }
      place.setCreateUser(AuthUtil.getUserId());
      return page.setRecords(baseMapper.selectPlacePage(page, place,list));
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
      // 遍历
      for (PlaceVO placeVO : placeVOS) {
         // 设置对应的网格名称
         GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
         if (null!= gridVO){
            placeVO.setGridName(gridVO.getGridName());
//            placeVO.setNeiName(gridVO.getCommunityName());
//            placeVO.setTownStreetName(gridVO.getTownStreetName());
         }
      }
      // 返回
      return page.setRecords(placeVOS);
   }

   /**
@@ -117,7 +138,11 @@
         QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted",0).eq("house_code",placeVO.getHouseCode());
         PlaceEntity one = getOne(wrapper);
         placeVO.setId(one.getId());
         if (null!=one) {
            placeVO.setId(one.getId());
         }
         // 设置来源( 1：地址总表  2：国控采集),扫码采集
         placeVO.setSource(1);
         // 绑定用户信息
         bindUserHandle(placeVO);
         // 更新场所信息
@@ -126,6 +151,8 @@
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定(更新，调整）
         placeLabelBind(placeVO);
         // 网格绑定
         gridBind(placeVO);
      }else {
         // 设置基础数据
         placeVO.setCreateUser(AuthUtil.getUserId());
@@ -142,10 +169,33 @@
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定
         placeLabelBind(placeVO);
         // 网格绑定
         gridBind(placeVO);
      }
      // 位置绑定，通过定位去匹配所在网格
      // 返回结果
      return flag;
   }

   /**
    * 网格绑定
    * @param placeVO
    */
   public void gridBind(PlaceVO placeVO) {
      if (null!=placeVO.getGridId()){
         // 判断关联关系表是否存在
         QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
         GridRangeEntity one = gridRangeService.getOne(wrapper);
         if (null==one){
            // 新增
            GridRangeEntity gridRangeEntity = new GridRangeEntity();
            gridRangeEntity.setHouseCode(placeVO.getHouseCode());
            gridRangeEntity.setGridId(placeVO.getGridId());
            // 插入
            gridRangeService.save(gridRangeEntity);
         }
      }
   }

   /**
@@ -180,13 +230,63 @@
   public void savePlaceLabel(PlaceVO placeVO) {
      // 批量新增
      List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
      // 遍历
      labelList.forEach(labelId -> {
         PlacePoiLabel placePoiLabel = new PlacePoiLabel();
         placePoiLabel.setPlaceId(placeVO.getId());
         placePoiLabel.setPoiCode(Integer.parseInt(labelId));
         placePoiLabelService.save(placePoiLabel);
      });
      if (labelList.size()>1){
         // 只处理小类
         // 遍历
         labelList.forEach(labelId -> {
            // 处理小类
            if (labelId.length()>4) {
               // 切割成三个，分别是大类，中类，小类
               String bigString = labelId.substring(0,2);
               String midString = labelId.substring(0,4);
               // 大类
               PlacePoiLabel big = new PlacePoiLabel();
               big.setPlaceId(placeVO.getId());
               big.setPoiCode(Integer.parseInt(bigString));
               big.setType(1);
               placePoiLabelService.save(big);
               // 中类
               PlacePoiLabel mid = new PlacePoiLabel();
               mid.setPlaceId(placeVO.getId());
               mid.setPoiCode(Integer.parseInt(midString));
               mid.setType(2);
               placePoiLabelService.save(mid);
               // 小类
               PlacePoiLabel min = new PlacePoiLabel();
               min.setPlaceId(placeVO.getId());
               min.setPoiCode(Integer.parseInt(labelId));
               min.setType(3);
               placePoiLabelService.save(min);
            }
         });
      }else {
         // 处理单个
         String labelCode = labelList.get(0);
         // 切割成三个，分别是大类，中类，小类
         String bigString = labelCode.substring(0,2);
         String midString = labelCode.substring(0,4);
         // 大类
         PlacePoiLabel big = new PlacePoiLabel();
         big.setPlaceId(placeVO.getId());
         big.setPoiCode(Integer.parseInt(bigString));
         big.setType(1);
         placePoiLabelService.save(big);
         // 中类
         PlacePoiLabel mid = new PlacePoiLabel();
         mid.setPlaceId(placeVO.getId());
         mid.setPoiCode(Integer.parseInt(midString));
         mid.setType(2);
         placePoiLabelService.save(mid);
         // 处理小类
         if (labelCode.length()>4) {
            // 小类
            PlacePoiLabel min = new PlacePoiLabel();
            min.setPlaceId(placeVO.getId());
            min.setPoiCode(Integer.parseInt(labelCode));
            min.setType(3);
            placePoiLabelService.save(min);
         }
      }
   }

   /**
@@ -333,9 +433,14 @@
               List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
               if (list.size() > 0) {
                  placeVO.setDoorplateAddressEntity(list.get(0));
                  placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
               }
               // 查询网格数据
               placeVO.setGrid(gridService.getGridDetailByHouseCode(place.getHouseCode()));
               GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
               if (null!= gridVO) {
                  placeVO.setGrid(gridVO);
                  place.setGridId(gridVO.getId());
               }
            } else {
               // 通过定位点落面分析网格位置，反向推出社区派出所相关数据

@@ -530,8 +635,50 @@
      // 修改场所信息
      flag = updateById(placeVO);
      // 修改标签绑定信息

      // 返回
      return flag;
   }

   /**
    * 场所标签数据处理
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Object placeLabelHandle() {
      // 查询所有的标签绑定
      List<PlacePoiLabel> list = placePoiLabelService.getPlacePoiLabelList();
      // 遍历
      for (PlacePoiLabel placePoiLabel : list) {
         // 处理单个
         String labelCode = placePoiLabel.getPoiCode().toString();
         // 切割成三个，分别是大类，中类，小类
         String bigString = labelCode.substring(0,2);
         String midString = labelCode.substring(0,4);
         // 大类
         PlacePoiLabel big = new PlacePoiLabel();
         big.setPlaceId(placePoiLabel.getPlaceId());
         big.setPoiCode(Integer.parseInt(bigString));
         big.setType(1);
         // 保存前先判断
         QueryWrapper<PlacePoiLabel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("place_id",placePoiLabel.getPlaceId()).eq("poi_code",Integer.parseInt(bigString));
         PlacePoiLabel one = placePoiLabelService.getOne(queryWrapper);
         if (null==one) {
            placePoiLabelService.save(big);
         }
         // 中类
         PlacePoiLabel mid = new PlacePoiLabel();
         mid.setPlaceId(placePoiLabel.getPlaceId());
         mid.setPoiCode(Integer.parseInt(midString));
         mid.setType(2);
         // 保存前先判断
         QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
         wrapper.eq("place_id",placePoiLabel.getPlaceId()).eq("poi_code",Integer.parseInt(midString));
         PlacePoiLabel two = placePoiLabelService.getOne(wrapper);
         if (null==two) {
            placePoiLabelService.save(mid);
         }
      }
      return null;
   }
}