|
@@ -6,29 +6,6 @@ import com.google.common.collect.Lists;
|
|
|
import com.microsvc.toolkit.middleware.im.ImPluginContext;
|
|
import com.microsvc.toolkit.middleware.im.ImPluginContext;
|
|
|
import com.microsvc.toolkit.middleware.im.impl.RongCloudImPlugin;
|
|
import com.microsvc.toolkit.middleware.im.impl.RongCloudImPlugin;
|
|
|
import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
|
|
import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
|
|
|
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
|
|
|
|
|
-import com.ym.mec.biz.dal.enums.EFriendRoleType;
|
|
|
|
|
-import com.ym.mec.biz.dal.enums.im.ClientEnum;
|
|
|
|
|
-import com.ym.mec.biz.dal.enums.im.EImGroupRoleType;
|
|
|
|
|
-import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
|
|
|
|
|
-import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
|
|
|
|
|
-import com.ym.mec.biz.service.*;
|
|
|
|
|
-import com.ym.mec.biz.service.im.ImGroupCoreService;
|
|
|
|
|
-import com.ym.mec.common.page.QueryInfo;
|
|
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
-import org.joda.time.DateTime;
|
|
|
|
|
-import org.redisson.api.RBucket;
|
|
|
|
|
-import org.redisson.api.RedissonClient;
|
|
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
-import org.springframework.dao.DuplicateKeyException;
|
|
|
|
|
-import org.springframework.security.authentication.LockedException;
|
|
|
|
|
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
|
-
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
import com.ym.mec.auth.api.entity.SysRole;
|
|
import com.ym.mec.auth.api.entity.SysRole;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
@@ -37,6 +14,7 @@ import com.ym.mec.biz.dal.dto.EmployeeDto;
|
|
|
import com.ym.mec.biz.dal.dto.EmployeeLevelDto;
|
|
import com.ym.mec.biz.dal.dto.EmployeeLevelDto;
|
|
|
import com.ym.mec.biz.dal.dto.SysUserDto;
|
|
import com.ym.mec.biz.dal.dto.SysUserDto;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
|
|
+import com.ym.mec.biz.dal.enums.EFriendRoleType;
|
|
|
import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
|
|
import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
|
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
import com.ym.mec.biz.dal.enums.ParamEnum;
|
|
import com.ym.mec.biz.dal.enums.ParamEnum;
|