Merge remote-tracking branch 'origin/master'

linwe

2023-12-08 aa237538c7e5f71f92372cc6deda1b1fac2e79e5

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

@@ -17,37 +17,33 @@
package org.springblade.modules.place.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.IdUtils;
import org.springblade.core.mp.support.Condition;
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.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
import org.springblade.modules.place.entity.PlaceRelEntity;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceRelService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 场所表 服务实现类
@@ -105,28 +101,51 @@
   }

   /**
    * 场所信息自定义新增
    * 场所信息自定义新增/修改
    * @param placeVO
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean addVO(PlaceVO placeVO) {
      // 设置基础数据
      placeVO.setCreateUser(AuthUtil.getUserId());
      placeVO.setCreateTime(new Date());
   public Boolean addOrUpdate(PlaceVO placeVO) {
      boolean flag = false;
      placeVO.setUpdateUser(AuthUtil.getUserId());
      placeVO.setUpdateTime(new Date());
      // 绑定用户信息
      bindUserHandle(placeVO);
      // 新增场所信息
      boolean save = save(placeVO);
      // 保存场所详情及任务信息
      savePlaceExtAndTaskInfo(placeVO);
      // 场所标签信息绑定
      placeLabelBind(placeVO);
      // 查看是否包含houseCode,如果有，则更新
      if (!Strings.isBlank(placeVO.getHouseCode())){
         // 更新,先查询场所信息
         QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted",0).eq("house_code",placeVO.getHouseCode());
         PlaceEntity one = getOne(wrapper);
         placeVO.setId(one.getId());
         // 绑定用户信息
         bindUserHandle(placeVO);
         // 更新场所信息
         flag = updateById(placeVO);
         // 保存场所详情及任务信息
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定(更新，调整）
         placeLabelBind(placeVO);
      }else {
         // 设置基础数据
         placeVO.setCreateUser(AuthUtil.getUserId());
         placeVO.setCreateTime(new Date());
         // 设置来源( 1：地址总表  2：国控采集)
         placeVO.setSource(2);
         // 并生成36位的houseCode
         placeVO.setHouseCode(IdUtils.getIdBy36());
         // 绑定用户信息
         bindUserHandle(placeVO);
         // 新增场所信息
         flag = save(placeVO);
         // 保存场所详情及任务信息
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定
         placeLabelBind(placeVO);
      }
      // 位置绑定，通过定位去匹配所在网格
      // 返回结果
      return save;
      return flag;
   }

   /**
@@ -135,9 +154,34 @@
    */
   @Transactional(rollbackFor = Exception.class)
   public void placeLabelBind(PlaceVO placeVO) {
      // 先查询对于的场所是否已有标签信息
      // 查询对应已存在的从业人员
      QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
      wrapper.eq("place_id",placeVO.getId());
      List<PlacePoiLabel> oldList = placePoiLabelService.list(wrapper);
      if (oldList.size()>0){
         // 先将老的全部删除，然后批量插入
         QueryWrapper<PlacePoiLabel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("place_id",placeVO.getId());
         boolean remove = placePoiLabelService.remove(queryWrapper);
         if (remove){
            // 批量新增
            savePlaceLabel(placeVO);
         }
      }else {
         savePlaceLabel(placeVO);
      }
   }

   /**
    * 插入场所标签信息
    * @param placeVO
    */
   public void savePlaceLabel(PlaceVO placeVO) {
      // 批量新增
      List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
      // 遍历
      labelList.forEach(labelId->{
      labelList.forEach(labelId -> {
         PlacePoiLabel placePoiLabel = new PlacePoiLabel();
         placePoiLabel.setPlaceId(placeVO.getId());
         placePoiLabel.setPoiCode(Integer.parseInt(labelId));
@@ -473,4 +517,21 @@
      }
      return null;
   }

   /**
    * 自定义修改
    * @param placeVO
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean updatePlace(PlaceVO placeVO) {
      boolean flag = false;
      // 修改场所信息
      flag = updateById(placeVO);
      // 修改标签绑定信息

      // 返回
      return flag;
   }
}