Merge remote-tracking branch 'origin/master'

linwe

2023-11-09 365b5ad817c9c8a2992d505aa39eccfa2be0460e

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

@@ -64,53 +64,82 @@
      return baseMapper.selectPlaceNodeList(userId.toString());
   }

   /**
    * 场所信息自定义新增
    * @param placeVO
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean addVO(PlaceVO placeVO) {

      // 设置基础数据
      placeVO.setCreateUser(AuthUtil.getUserId());
      placeVO.setCreateTime(new Date());
      placeVO.setUpdateUser(AuthUtil.getUserId());
      placeVO.setUpdateTime(new Date());

      //根据手机号查询库里的数据
      User userParams = new User();
      userParams.setPhone(placeVO.getPhone());
      User user = userService.getOne(Condition.getQueryWrapper(userParams));

      if (user != null){
         //如果用户存在，则该用户id绑定场所
         placeVO.setPrincipalUserId(user.getId());
      }else{
         //如果用户不存在，则新增一个用户
         User newUser = new User();
         newUser.setAccount(placeVO.getPhone());
         newUser.setPhone(placeVO.getPhone());

         newUser.setName(placeVO.getUsername());
         newUser.setRealName(placeVO.getUsername());
         newUser.setRoleId("1717429193350434818");
         newUser.setPassword("123456");

         userService.submit(newUser);
         //绑定id
         placeVO.setPrincipalUserId(newUser.getId());
      }

      // 绑定用户信息
      bindUserHandle(placeVO);
      // 新增场所信息
      boolean save = save(placeVO);
      // 场所标签信息绑定
      placeLabelBind(placeVO);
      // 返回结果
      return save;
   }


   /**
    * 场所标签信息绑定入库
    * @param placeVO
    */
   @Transactional(rollbackFor = Exception.class)
   public void placeLabelBind(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);
      });
   }

   /**
    * 场所负责人和用户绑定
    * @param placeVO
    */
   @Transactional(rollbackFor = Exception.class)
   public void bindUserHandle(PlaceVO placeVO) {
      if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
         //根据手机号查询库里的数据
         User userParams = new User();
         userParams.setPhone(placeVO.getPhone());
         User user = userService.getOne(Condition.getQueryWrapper(userParams));

      return save;
         if (user != null) {
            //如果用户存在，则该用户id绑定场所
            placeVO.setPrincipalUserId(user.getId());
         } else {
            //如果用户不存在，则新增一个用户
            User newUser = new User();
            newUser.setAccount(placeVO.getPhone());
            newUser.setPhone(placeVO.getPhone());
            newUser.setName(placeVO.getUsername());
            newUser.setRealName(placeVO.getUsername());
            // 目前暂定居民角色，默认密码为 123456
            newUser.setRoleId("1717429059648606209");
            newUser.setPassword("123456");
            // 用户新增
            boolean submit = userService.submit(newUser);
            //绑定id
            placeVO.setPrincipalUserId(newUser.getId());
            //给人员打上场所负责人的标签

            // 用户插入后同时给场所详情表插入一条该场所信息
            if (submit){

            }
         }
      }
   }