lin
2024-04-19 f805ebc9eda4110736969dbdb211444e7297fb60
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -217,6 +217,11 @@
      jwGridCodeBind(placeVO);
      // 保存从业人员
      savePlacePractitioner(placeVO);
      // 判断是否校园
      if (placeVO.getLabel().startsWith("1601")) {
         // 校园的新增一个主体用户和一个通用用户
         addSchoolUser(placeVO);
      }
      // 返回结果
      return flag;
   }
@@ -232,7 +237,7 @@
         IPlacePractitionerService practitionerService = SpringUtil.getBean(IPlacePractitionerService.class);
         // 查询对应已存在的租户
         QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("place_id", placeVO.getId()).eq("is_deleted",0);
         wrapper.eq("place_id", placeVO.getId()).eq("is_deleted", 0);
         List<PlacePractitionerEntity> oldList = practitionerService.list(wrapper);
         // 取出从业人员信息
         List<PlacePractitionerEntity> placePractitionerList = placeVO.getPlacePractitioner();
@@ -713,6 +718,48 @@
   }
   /**
    * 新增校方主体账号和通用账号
    *
    * @param placeVO
    * @return
    */
   @Transactional(rollbackFor = Exception.class)
   public User addSchoolUser(PlaceVO placeVO) {
      User newUser = new User();
      if (StringUtils.isNotBlank(placeVO.getPlaceName())) {
//         placeVO.setPrincipal(placeVO.getPrincipal());
//         placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
         //如果用户不存在,则新增一个用户
         newUser.setAccount(placeVO.getPlaceName() + "主体");
         newUser.setName(placeVO.getPlaceName() + "-主体");
         newUser.setRealName(placeVO.getPlaceName() + "-主体");
         // 社区群众部门
         newUser.setDeptId("1727979636479037441");
         // 校园主体,
         newUser.setRoleId("1780786647371706370");
         //默认密码为 123456
         newUser.setPassword("123456");
         // 设置机构
         // 用户新增
         newUser.setId(null);
         boolean submit = userService.submit(newUser);
         // 校园通用
         newUser.setId(null);
         newUser.setRoleId("1780786746076262402");
         newUser.setAccount(placeVO.getPlaceName() + "通用");
         newUser.setName(placeVO.getPlaceName() + "-通用");
         newUser.setRealName(placeVO.getPlaceName() + "-通用");
         boolean submit2 = userService.submit(newUser);
         //绑定id
//         placeVO.setPrincipalUserId(newUser.getId());
         //给人员打上场所负责人的标签
//         baseMapper.saveUserLabel(newUser.getId(), 1002);
      }
      return newUser;
   }
   /**
    * 场所负责人和用户绑定
    *
    * @param placeVO
@@ -725,7 +772,7 @@
         placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
         //根据手机号查询库里的数据
         List<User> list = userService.getUserListByPhoneOrAccount(placeVO.getPrincipalPhone());
         if (list.size()>0) {
         if (list.size() > 0) {
            User user = list.get(0);
            //如果用户存在,则该用户id绑定场所
            placeVO.setPrincipalUserId(user.getId());
@@ -972,7 +1019,7 @@
            // 来源 1:地址总表  2:国控采集 3:商超
            if (!Strings.isBlank(placeExcel.getHouseCode())) {
               placeEntity.setSource(1);
            }else {
            } else {
               placeEntity.setSource(2);
               // 并生成36位的houseCode
               placeEntity.setHouseCode(IdUtils.getIdBy36());
@@ -983,7 +1030,7 @@
               placeEntity.setNineType(Integer.parseInt(placeExcel.getNineType()));
            }
            // 网格绑定处理
            importGridHandle(placeExcel,placeEntity);
            importGridHandle(placeExcel, placeEntity);
            // 新增
            save(placeEntity);
            // 保存详情
@@ -998,7 +1045,7 @@
            }
            // 房屋编号绑定处理
            houseCodeBindHandle(placeEntity);
         }else {
         } else {
            // 更新
            Long userId = updateUser(placeExcel);
            // 插入场所
@@ -1025,7 +1072,7 @@
               placeEntity.setNineType(Integer.parseInt(placeExcel.getNineType()));
            }
            // 网格绑定处理
            importGridHandle(placeExcel,placeEntity);
            importGridHandle(placeExcel, placeEntity);
            // 更新
            updateById(placeEntity);
            // 场所标签信息处理
@@ -1042,15 +1089,16 @@
   /**
    * 导入是网格数据绑定处理
    *
    * @param placeExcel
    * @param placeEntity
    */
   private void importGridHandle(PlaceExcel placeExcel, PlaceVO placeEntity) {
      if (!Strings.isBlank(placeExcel.getCommunityName()) &&
         !Strings.isBlank(placeExcel.getGridName())){
         !Strings.isBlank(placeExcel.getGridName())) {
         // 查询对应的网格信息
         GridEntity gridEntity = gridService.getGridInfoByParam(placeExcel.getCommunityName(),placeExcel.getGridName());
         if (null!=gridEntity){
         GridEntity gridEntity = gridService.getGridInfoByParam(placeExcel.getCommunityName(), placeExcel.getGridName());
         if (null != gridEntity) {
            // 设置场所范围
            placeEntity.setGridId(gridEntity.getId());
            placeEntity.setGridCode(gridEntity.getGridCode());
@@ -1060,8 +1108,8 @@
            gridRangeEntity.setGridCode(gridEntity.getGridCode());
            gridRangeEntity.setHouseCode(placeEntity.getHouseCode());
            UpdateWrapper<GridRangeEntity> updateWrapper = new UpdateWrapper<>();
            updateWrapper.eq("house_code",placeEntity.getHouseCode());
            gridRangeService.update(gridRangeEntity,updateWrapper);
            updateWrapper.eq("house_code", placeEntity.getHouseCode());
            gridRangeService.update(gridRangeEntity, updateWrapper);
         }
      }
   }
@@ -1666,15 +1714,17 @@
   /**
    * 查询所有场所数据
    *
    * @return
    */
   @Override
   public List<PlaceVO> getAllList(int i,int size) {
      return baseMapper.getAllList(i,size);
   public List<PlaceVO> getAllList(int i, int size) {
      return baseMapper.getAllList(i, size);
   }
   /**
    * 查询所有场所数据总数
    *
    * @return
    */
   @Override
@@ -1684,6 +1734,7 @@
   /**
    * 查询对应的社区编号
    *
    * @param id
    * @return
    */