拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

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

@@ -19,24 +19,32 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
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.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.mapper.GridMapper;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IHouseholdService;
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.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceRelService;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
@@ -84,7 +92,10 @@
   private IGridmanService gridmanService;

   @Autowired
   private IDeptService deptService;
   private GridMapper gridMapper;

   @Autowired
   private IHouseholdService householdService;

   /**
    * 自定义列表查询
@@ -94,32 +105,16 @@
    */
   @Override
   public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         place.setRegionCode(dept.getRegionCode());
      }
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      List<String> list = new ArrayList<>();
      if (null!=place.getRoleName() && !place.getRoleName().equals("")){
         if (place.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
            place.setCreateUser(AuthUtil.getUserId());
         }
         if (!place.getRoleName().equals("系统管理员")){
            place.setCreateUser(AuthUtil.getUserId());
         }
      }
      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());
         }
      }
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place,list,regionChildCodesList,isAdministrator);
      // 返回
      return page.setRecords(placeVOS);
   }
@@ -154,18 +149,12 @@
         if (null!=one) {
            placeVO.setId(one.getId());
         }
         // 设置来源( 1：地址总表  2：国控采集),扫码采集
         placeVO.setSource(1);
         // 绑定用户信息
         bindUserHandle(placeVO);
         // 设置完善状态
         setPlaceStatus(placeVO);
         // 更新场所信息
         flag = updateById(placeVO);
         // 保存场所详情及任务信息
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定(更新，调整）
         placeLabelBind(placeVO);
         // 网格绑定
         gridBind(placeVO);
      }else {
         // 设置基础数据
         placeVO.setCreateUser(AuthUtil.getUserId());
@@ -176,18 +165,75 @@
         placeVO.setHouseCode(IdUtils.getIdBy36());
         // 绑定用户信息
         bindUserHandle(placeVO);
         // 设置完善状态
         setPlaceStatus(placeVO);
         // 新增场所信息
         flag = save(placeVO);
         // 保存场所详情及任务信息
         savePlaceExtAndTaskInfo(placeVO);
         // 场所标签信息绑定
         placeLabelBind(placeVO);
         // 网格绑定
         gridBind(placeVO);
      }
      // 位置绑定，通过定位去匹配所在网格
      // 保存场所详情及任务信息
      savePlaceExtAndTaskInfo(placeVO);
      // 场所标签信息绑定(更新，调整）
      placeLabelBind(placeVO);
      // 网格绑定
      gridBind(placeVO);
      // 网格编号绑定场所-新
      gridCodeBind(placeVO);
      // 房屋编号绑定
//      houseCodeBind(placeVO);
      // 返回结果
      return flag;
   }

   /**
    * 房屋绑定
    * @param placeVO
    */
   public void houseCodeBind(PlaceVO placeVO) {
      String houseCode = placeVO.getHouseCode();
      List<String> list = Arrays.asList(houseCode.split(","));
      if (list.size()>1){
         // 处理对应的绑定房屋数据
         List<Long> longs = new ArrayList<>();
         // 把其他单个的场所数据删除
         for (String code : list) {
            // 先查询对应的场所id
            QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("house_code",code).eq("is_deleted",0);
            PlaceEntity one = getOne(wrapper);
            if (null!=one){
               longs.add(one.getId());
               // 删除对应的单个编号的场所
               removeById(one.getId());
            }
         }
         if (longs.size()>0) {
            // 删除对应的详情
            removePlaceExt(longs);
            // 删除对应的标签绑定信息
            removePlaceLabel(longs);
         }
      }else {
         // 一对一,暂时不处理，后续考虑需加绑定关系表
      }
   }

   /**
    * 设置场所完善状态
    * @param placeVO
    */
   private void setPlaceStatus(PlaceVO placeVO) {
      if (!Strings.isBlank(placeVO.getPrincipal())
         && !Strings.isBlank(placeVO.getPrincipalPhone())
         && !Strings.isBlank(placeVO.getLocation())
         && !Strings.isBlank(placeVO.getPlaceName())
         && !Strings.isBlank(placeVO.getImageUrls())
      ){
         // 已完善
         placeVO.setStatus(2);
      }else {
         // 未完善
         placeVO.setStatus(1);
      }
   }

   /**
@@ -198,7 +244,7 @@
      if (null!=placeVO.getGridId()){
         // 判断关联关系表是否存在
         QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
         wrapper.eq("house_code",placeVO.getHouseCode());
         GridRangeEntity one = gridRangeService.getOne(wrapper);
         if (null==one){
            // 新增
@@ -207,23 +253,136 @@
            gridRangeEntity.setGridId(placeVO.getGridId());
            // 插入
            gridRangeService.save(gridRangeEntity);
         }else {
            // 修改绑定
            one.setGridId(placeVO.getGridId());
            // 修改
            gridRangeService.updateById(one);
         }
      }else {
         // 判断角色，如果是网格员则直接使用网格员的网格id,如果是民警则采用点落面的方式进行获取网格的id
         if (!Strings.isBlank(placeVO.getRoleName())) {
            // 网格员角色位置绑定
            gridmanPositionHandle(placeVO);
            // 民警角色位置绑定
            policePositionHandle(placeVO);
         }
      }
   }

   /**
    * 网格编号绑定
    * @param placeVO
    */
   public void gridCodeBind(PlaceVO placeVO) {
      // 无网格编号时
      if (Strings.isBlank(placeVO.getGridCode())){
         // 判断角色，如果是网格员则直接使用网格员的网格id,如果是民警则采用点落面的方式进行获取网格的id
         if (!Strings.isBlank(placeVO.getRoleName())) {
            // 网格员场所网格编号绑定-新
            gridmanGridCodePositionHandle(placeVO);
            // 民警角色时通过位置绑定网格-新
            policeGridCodePositionHandle(placeVO);
         }
      }
   }

   /**
    * 网格员角色位置绑定-grid_id
    * @param placeVO
    */
   public void gridmanPositionHandle(PlaceVO placeVO) {
      if (placeVO.getRoleName().equals("网格员")) {
         // 判断网格员，查询对应网格人对应的网格id
         Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
         if (null!=gridId){
         if (null != gridId) {
            // 判断关联关系表是否存在
            QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("grid_id",gridId).eq("house_code",placeVO.getHouseCode());
            wrapper.eq("grid_id", gridId).eq("house_code", placeVO.getHouseCode());
            GridRangeEntity one = gridRangeService.getOne(wrapper);
            if (null==one){
            if (null == one) {
               // 新增
               GridRangeEntity gridRangeEntity = new GridRangeEntity();
               gridRangeEntity.setHouseCode(placeVO.getHouseCode());
               gridRangeEntity.setGridId(gridId);
               // 插入
               gridRangeService.save(gridRangeEntity);
            }else {
               // 修改绑定
               one.setGridId(placeVO.getGridId());
               // 修改
               gridRangeService.updateById(one);
            }
         }
      }
   }

   /**
    * 网格员角色位置绑定-grid_code
    * @param placeVO
    */
   public void gridmanGridCodePositionHandle(PlaceVO placeVO) {
      if (placeVO.getRoleName().equals("网格员")) {
         // 判断网格员，查询对应网格人对应的网格
         GridEntity grid = gridService.getGridByUserId(AuthUtil.getUserId());
         if (null != grid && !Strings.isBlank(grid.getGridCode())) {
            // 场所编号绑定
            placeVO.setGridCode(grid.getGridCode());
            // 更新场所信息
            updateById(placeVO);
         }
      }
   }

   /**
    * 民警角色位置绑定
    * @param placeVO
    */
   private void policePositionHandle(PlaceVO placeVO) {
      // 是民警且位置信息存在
      if (placeVO.getRoleName().equals("民警") && !Strings.isBlank(placeVO.getLng())) {
         //点坐标解析
         String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
//         String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
         GridEntity gridEntity = gridMapper.spatialAnalysis(point);
         if (null != gridEntity) {
            // 判断关联关系表是否存在
            QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("grid_id", gridEntity.getId()).eq("house_code", placeVO.getHouseCode());
            GridRangeEntity one = gridRangeService.getOne(wrapper);
            if (null == one) {
               // 新增
               GridRangeEntity gridRangeEntity = new GridRangeEntity();
               gridRangeEntity.setHouseCode(placeVO.getHouseCode());
               gridRangeEntity.setGridId(gridEntity.getId());
               // 插入
               gridRangeService.save(gridRangeEntity);
            }else {
               // 修改绑定
               one.setGridId(placeVO.getGridId());
               // 修改
               gridRangeService.updateById(one);
            }
         }
      }
   }

   /**
    * 民警角色时通过位置绑定网格
    * @param placeVO
    */
   private void policeGridCodePositionHandle(PlaceVO placeVO) {
      // 是民警且位置信息存在
      if (placeVO.getRoleName().equals("民警") && !Strings.isBlank(placeVO.getLng())) {
         //点坐标解析
         String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
//         String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
         GridEntity gridEntity = gridMapper.spatialAnalysis(point);
         if (null != gridEntity && !Strings.isBlank(gridEntity.getGridCode())) {
            // 场所编号绑定
            placeVO.setGridCode(gridEntity.getGridCode());
            // 更新场所信息
            updateById(placeVO);
         }
      }
   }
@@ -258,63 +417,83 @@
    * @param placeVO
    */
   public void savePlaceLabel(PlaceVO placeVO) {
      // 批量新增
      List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
      if (labelList.size()>1){
         // 只处理小类
         // 遍历
         labelList.forEach(labelId -> {
      if (!Strings.isBlank(placeVO.getLabel())) {
         // 批量新增
         List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
         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);
                  if (!Strings.isBlank(placeVO.getColor())) {
                     big.setColor(placeVO.getColor());
                  }
                  placePoiLabelService.save(big);
                  // 中类
                  PlacePoiLabel mid = new PlacePoiLabel();
                  mid.setPlaceId(placeVO.getId());
                  mid.setPoiCode(Integer.parseInt(midString));
                  mid.setType(2);
                  if (!Strings.isBlank(placeVO.getColor())) {
                     mid.setColor(placeVO.getColor());
                  }
                  placePoiLabelService.save(mid);
                  // 小类
                  PlacePoiLabel min = new PlacePoiLabel();
                  min.setPlaceId(placeVO.getId());
                  min.setPoiCode(Integer.parseInt(labelId));
                  min.setType(3);
                  if (!Strings.isBlank(placeVO.getColor())) {
                     min.setColor(placeVO.getColor());
                  }
                  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);
            if (!Strings.isBlank(placeVO.getColor())) {
               big.setColor(placeVO.getColor());
            }
            placePoiLabelService.save(big);
            // 中类
            PlacePoiLabel mid = new PlacePoiLabel();
            mid.setPlaceId(placeVO.getId());
            mid.setPoiCode(Integer.parseInt(midString));
            mid.setType(2);
            if (!Strings.isBlank(placeVO.getColor())) {
               mid.setColor(placeVO.getColor());
            }
            placePoiLabelService.save(mid);
            // 处理小类
            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);
            if (labelCode.length() > 4) {
               // 小类
               PlacePoiLabel min = new PlacePoiLabel();
               min.setPlaceId(placeVO.getId());
               min.setPoiCode(Integer.parseInt(labelId));
               min.setPoiCode(Integer.parseInt(labelCode));
               min.setType(3);
               if (!Strings.isBlank(placeVO.getColor())) {
                  min.setColor(placeVO.getColor());
               }
               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);
         }
      }
   }
@@ -326,13 +505,20 @@
   @Transactional(rollbackFor = Exception.class)
   public User bindUserHandle(PlaceVO placeVO) {
      User newUser = new User();
      if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
         placeVO.setPrincipal(placeVO.getUsername());
         placeVO.setPrincipalPhone(placeVO.getPhone());
      if (null!=placeVO.getPrincipalPhone() && !placeVO.getPrincipalPhone().equals("")) {
         placeVO.setPrincipal(placeVO.getPrincipal());
         placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
         //根据手机号查询库里的数据
         User userParams = new User();
         userParams.setPhone(placeVO.getPhone());
         userParams.setPhone(placeVO.getPrincipalPhone());
         userParams.setIsDeleted(0);
         User user = userService.getOne(Condition.getQueryWrapper(userParams));
         if (null==user){
            User userParams1 = new User();
            userParams1.setAccount(placeVO.getPrincipalPhone());
            userParams1.setIsDeleted(0);
            user = userService.getOne(Condition.getQueryWrapper(userParams1));
         }

         if (null!=user) {
            //如果用户存在，则该用户id绑定场所
@@ -346,10 +532,10 @@
            }
         } else {
            //如果用户不存在，则新增一个用户
            newUser.setAccount(placeVO.getPhone());
            newUser.setPhone(placeVO.getPhone());
            newUser.setName(placeVO.getUsername());
            newUser.setRealName(placeVO.getUsername());
            newUser.setAccount(placeVO.getPrincipalPhone());
            newUser.setPhone(placeVO.getPrincipalPhone());
            newUser.setName(placeVO.getPrincipal());
            newUser.setRealName(placeVO.getPrincipal());
            // 社区群众部门
            newUser.setDeptId("1727979636479037441");
            // 目前暂定居民角色，
@@ -383,9 +569,14 @@
      PlaceExtEntity one = placeExtService.getOne(wrapper);
      if (null == one) {
         placeExtEntity.setPlaceId(placeVO.getId());
         placeExtEntity.setLocaltion(placeVO.getLocaltion());
         //新增
         placeExtService.savePlaceExt(placeExtEntity);
         // 默认给待完善状态
         placeExtEntity.setConfirmFlag(4);
         placeExtEntity.setCreateTime(new Date());
         placeExtEntity.setUpdateTime(new Date());
         placeExtEntity.setCreateUser(AuthUtil.getUserId());
         placeExtEntity.setUpdateUser(AuthUtil.getUserId());
         // 新增场所详情
         placeExtService.save(placeExtEntity);
      }
   }

@@ -444,38 +635,36 @@
   public PlaceVO getDetail(PlaceVO place) {
      // 查询场所信息
      PlaceVO placeVO = baseMapper.getDetail(place);
      if (null!= place.getAddressType() && place.getAddressType()==4){
         if (null != placeVO) {
      // 门牌信息
      if (null != placeVO) {
         if (null != place.getAddressType() && place.getAddressType() == 4) {
            // 查询地址编码信息（社区派出所相关信息）
            DoorplateAddressEntity addressEntity = placeRelService.getDoorplateAddressEntity(placeVO);
            placeVO.setDoorplateAddressEntity(addressEntity);
            // 查询网格信息
            // 查询网格信息--商超
            placeVO.setGrid(gridService.getGridDetailByParam(placeVO));
         }
      }else {
         if (null != placeVO) {
            if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")) {
               place.setHouseCode(placeVO.getHouseCode());
            }
            // 查询门牌地址信息
            if (null != place.getHouseCode() && !place.getHouseCode().equals("")) {
               QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
               wrapper.eq("address_code", place.getHouseCode());
               List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
               if (list.size() > 0) {
                  placeVO.setDoorplateAddressEntity(list.get(0));
                  placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
         } else {
            // 管理后台查询赋值颜色
            if (placeVO.getPlacePoiLabelVOList().size() > 0) {
               PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
               if (!Strings.isBlank(placePoiLabelVO.getColor())) {
                  placeVO.setColor(placePoiLabelVO.getColor());
               }
               // 查询网格数据
               GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
               if (null!= gridVO) {
                  placeVO.setGrid(gridVO);
                  place.setGridId(gridVO.getId());
               }
            } else {
               // 通过定位点落面分析网格位置，反向推出社区派出所相关数据

            }
            // 查询地址门牌信息
            QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("address_code", placeVO.getHouseCode());
            List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
            if (list.size() > 0) {
               placeVO.setDoorplateAddressEntity(list.get(0));
               placeVO.setNeiCode(list.get(0).getNeiCode());
            }
            // 查询场所对应的网格数据
            placeVO.setGrid(gridService.getPlaceGridDetailByHouseCode(placeVO.getHouseCode()));
            // 设置详情信息
            QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
            placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
         }
      }
      // 返回
@@ -557,6 +746,7 @@
    * @param isCovered
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importAndRelPlace(List<PlaceAndRelExcel> data, Boolean isCovered) {
      for (PlaceAndRelExcel placeExcel : data) {
         // 判断是否存在，不存在则插入，否则不操作
@@ -566,7 +756,7 @@
            // 插入场所
            PlaceEntity placeEntity = new PlaceEntity();
            placeEntity.setPlaceName(placeExcel.getPlaceName());
            placeEntity.setLocaltion(placeExcel.getAddress());
            placeEntity.setLocation(placeExcel.getAddress());
            placeEntity.setPrincipalUserId(userId);
            placeEntity.setPrincipal(placeExcel.getName());
            placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
@@ -575,6 +765,10 @@
            placeEntity.setCreateUser(AuthUtil.getUserId());
            placeEntity.setUpdateTime(new Date());
            placeEntity.setUpdateUser(AuthUtil.getUserId());
            // 并生成36位的houseCode
            placeEntity.setHouseCode(IdUtils.getIdBy36());
            // 商超数据
            placeEntity.setSource(3);
            //一个一个插入，防止同一个表中有相同的数据
            save(placeEntity);
            // 插入标签关系表
@@ -601,7 +795,7 @@
            PlaceEntity placeEntity = new PlaceEntity();
            placeEntity.setId(one.getId());
            placeEntity.setPlaceName(placeExcel.getPlaceName());
            placeEntity.setLocaltion(placeExcel.getAddress());
            placeEntity.setLocation(placeExcel.getAddress());
            placeEntity.setPrincipalUserId(userId);
            placeEntity.setCreateTime(new Date());
            placeEntity.setCreateUser(AuthUtil.getUserId());
@@ -712,4 +906,161 @@
      }
      return null;
   }

   /**
    * 历史场所详情数据处理
    * @param place
    * @return
    */
   @Override
   public Object historyPlaceExtHandle(PlaceVO place) {
      // 查询所有的场所数据（除去详情表已有的）
      List<PlaceEntity> list = baseMapper.getPlaceListByNoExt();
      // 遍历更新
      for (PlaceEntity placeEntity : list) {
         QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("place_id",placeEntity.getId()).eq("is_deleted",0);
         PlaceExtEntity one = placeExtService.getOne(queryWrapper);
         if (null==one){
            // 新增
            PlaceExtEntity placeExtEntity = new PlaceExtEntity();
            if (null!=placeEntity.getPrincipalUserId()){
               // 待审核
               placeExtEntity.setConfirmFlag(1);
            }else {
               // 待完善
               placeExtEntity.setConfirmFlag(4);
            }
            placeExtEntity.setPlaceId(placeEntity.getId());
            // 插入
            placeExtService.save(placeExtEntity);
         }
      }
      return null;
   }

   /**
    * 商超数据处理
    * @return
    */
   @Override
   public Object placeAndRelHandle() {
      // 查询未处理的商超数据
      List<PlaceEntity> placeEntityList = baseMapper.placeAndRelHandle();
      // 处理
      for (PlaceEntity placeEntity : placeEntityList) {
         if (Strings.isBlank(placeEntity.getHouseCode())){
            // 并生成36位的houseCode
            placeEntity.setHouseCode(IdUtils.getIdBy36());
            // 商超数据
            placeEntity.setSource(3);
            // 更新
            updateById(placeEntity);
         }
      }
      return null;
   }

   /**
    * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）
    * @param stringList
    * @param tableName
    * @return
    */
   @Override
   public List<PlaceVO> getPlaceListByParam(List<String> stringList,String tableName) {
      return baseMapper.getPlaceListByParam(stringList,tableName);
   }

   /**
    * 删除
    * @param longs
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean removePlace(List<Long> longs) {
      // 删除场所负责人对应的用户
      removeUser(longs);
      // 删除
      boolean removeByIds = removeByIds(longs);
      // 删除对应的详情
      removePlaceExt(longs);
      // 删除对应的标签绑定信息
      removePlaceLabel(longs);
      // 返回
      return removeByIds;
   }

   /**
    * 删除场所负责人对应的用户
    * @param longs
    */
   public void removeUser(List<Long> longs) {
      // 遍历
      for (Long id : longs) {
         PlaceEntity placeEntity = getById(id);
         if (null!=placeEntity.getPrincipalUserId()){
            User user = userService.getById(placeEntity.getPrincipalUserId());
            // 查询场所判断是否还绑定有其他的场所
            QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted",0).eq("principal_user_id",user.getId());
            List<PlaceEntity> placeEntityList = list(queryWrapper);
            // 如果没有（1个 当前的还没有删除）
            if (placeEntityList.size()==1){
               // 判断角色
               if (!Strings.isBlank(user.getRoleId())){
                  // 判断是否还绑定其他的房屋，如果有，则不操作用户
                  QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
                  wrapper.eq("is_deleted",0).eq("associated_user_id",user.getId());
                  List<HouseholdEntity> householdEntityList = householdService.list(wrapper);
                  // 即没有房屋和场所了就删除对应的居民角色
                  if (householdEntityList.size()==0) {
                     List<String> stringList = Arrays.asList(user.getRoleId().split(","));
                     // 查看当前用户的角色是否只有一个
                     if (stringList.size() > 1) {
                        // 查询是否对应有场所负责人，如果有则不删除，如果没有则删除对应的角色
                        List<String> arrayList = new ArrayList<>();
                        for (String roleId : stringList) {
                           if (!roleId.equals("1717429059648606209")) {
                              arrayList.add(roleId);
                           }
                        }
                        user.setRoleId(StringUtils.join(arrayList, ","));
                        // 更新用户
                        userService.updateById(user);
                     } else {
                        // 删除当前用户
                        userService.removeById(user.getId());
                     }
                  }
               }
            }
         }
      }
   }

   /**
    * 删除场所对应的详情
    * @param longs
    */
   public void removePlaceExt(List<Long> longs) {
      for (Long id : longs) {
         QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("place_id",id);
         placeExtService.remove(wrapper);
      }
   }

   /**
    * 删除对应的标签绑定信息
    * @param longs
    */
   public void removePlaceLabel(List<Long> longs) {
      for (Long id : longs) {
         QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
         wrapper.eq("place_id",id);
         placePoiLabelService.remove(wrapper);
      }
   }
}