|
@@ -2,14 +2,10 @@ package com.yonge.cooleshow.biz.dal.service.im.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
-import com.google.common.collect.Maps;
|
|
|
|
-import com.microsvc.toolkit.common.response.paging.QueryInfo;
|
|
|
|
import com.microsvc.toolkit.common.tools.ThreadPool;
|
|
import com.microsvc.toolkit.common.tools.ThreadPool;
|
|
-import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
|
|
|
|
import com.microsvc.toolkit.middleware.im.ImPluginContext;
|
|
import com.microsvc.toolkit.middleware.im.ImPluginContext;
|
|
import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
|
|
import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
|
|
import com.microsvc.toolkit.middleware.im.properties.ImConfigProperties;
|
|
import com.microsvc.toolkit.middleware.im.properties.ImConfigProperties;
|
|
@@ -18,7 +14,6 @@ import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroupMemberAudit;
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroupMemberAudit;
|
|
import com.yonge.cooleshow.biz.dal.enums.AuditStatusEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.AuditStatusEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
-import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
|
|
|
|
import com.yonge.cooleshow.biz.dal.enums.RoleEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.RoleEnum;
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberAuditService;
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberAuditService;
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
|
|
@@ -30,14 +25,12 @@ import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
-import org.apache.commons.collections.MapUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.text.MessageFormat;
|
|
import java.text.MessageFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
-import java.util.function.Function;
|
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -176,7 +169,7 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
|
|
* @return Boolean
|
|
* @return Boolean
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public Long groupCreate(GroupMemberWrapper.ImGroupMember userInfo, ImGroupWrapper.ImGroup imGroup) throws Exception {
|
|
|
|
|
|
+ public String groupCreate(GroupMemberWrapper.ImGroupMember userInfo, ImGroupWrapper.ImGroup imGroup) throws Exception {
|
|
|
|
|
|
long id = Optional.ofNullable(imGroup.getId()).orElse(IdWorker.getId());
|
|
long id = Optional.ofNullable(imGroup.getId()).orElse(IdWorker.getId());
|
|
// 生成群组ID
|
|
// 生成群组ID
|
|
@@ -218,7 +211,7 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
|
|
imPluginContext.getPluginService().groupJoin(imGroup.getGroupId(), imGroup.getName(),
|
|
imPluginContext.getPluginService().groupJoin(imGroup.getGroupId(), imGroup.getName(),
|
|
getImGroupMembers(groupMembers));
|
|
getImGroupMembers(groupMembers));
|
|
|
|
|
|
- return imGroup.getId();
|
|
|
|
|
|
+ return imGroup.getGroupId();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|