|
@@ -5,12 +5,15 @@ import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.biz.dal.dao.ImGroupDao;
|
|
import com.ym.mec.biz.dal.dao.ImGroupDao;
|
|
import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
|
|
import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
|
|
import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
|
|
import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.ImUserFriendDao;
|
|
import com.ym.mec.biz.dal.dto.ImGroupDto;
|
|
import com.ym.mec.biz.dal.dto.ImGroupDto;
|
|
import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
|
|
import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.NameDto;
|
|
import com.ym.mec.biz.dal.entity.ImGroup;
|
|
import com.ym.mec.biz.dal.entity.ImGroup;
|
|
import com.ym.mec.biz.dal.entity.ImGroupMember;
|
|
import com.ym.mec.biz.dal.entity.ImGroupMember;
|
|
import com.ym.mec.biz.service.ImGroupMemberService;
|
|
import com.ym.mec.biz.service.ImGroupMemberService;
|
|
import com.ym.mec.biz.service.ImGroupService;
|
|
import com.ym.mec.biz.service.ImGroupService;
|
|
|
|
+import com.ym.mec.biz.service.SysUserService;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.entity.ImUserModel;
|
|
import com.ym.mec.common.entity.ImUserModel;
|
|
import com.ym.mec.common.exception.BizException;
|
|
import com.ym.mec.common.exception.BizException;
|
|
@@ -48,7 +51,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
private ImFeignService imFeignService;
|
|
private ImFeignService imFeignService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private SysUserFeignService sysUserFeignService;
|
|
|
|
|
|
+ private SysUserService sysUserService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private ImUserFriendDao imUserFriendDao;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<String, ImGroup> getDAO() {
|
|
public BaseDAO<String, ImGroup> getDAO() {
|
|
@@ -106,8 +112,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
List<String> userIdList = imGroupDto.getUserIdList();
|
|
List<String> userIdList = imGroupDto.getUserIdList();
|
|
Integer currentUserId = null;
|
|
Integer currentUserId = null;
|
|
if (CollectionUtils.isEmpty(userIdList)){
|
|
if (CollectionUtils.isEmpty(userIdList)){
|
|
- currentUserId = sysUserFeignService.queryUserInfo().getId();
|
|
|
|
- userIdList.add(currentUserId.toString());
|
|
|
|
|
|
+ userIdList.add(sysUserService.getUserId().toString());
|
|
}
|
|
}
|
|
String groupName = imGroupDto.getGroupName();
|
|
String groupName = imGroupDto.getGroupName();
|
|
String type = imGroupDto.getType();
|
|
String type = imGroupDto.getType();
|
|
@@ -192,13 +197,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
imGroupDao.updateNickname(userId, nickName);
|
|
imGroupDao.updateNickname(userId, nickName);
|
|
imGroupDao.updateUserFriendNickname(userId, nickName);
|
|
imGroupDao.updateUserFriendNickname(userId, nickName);
|
|
//修改sysUser名称,如果包含学员的角色,那么修改userName。否则修改realName
|
|
//修改sysUser名称,如果包含学员的角色,那么修改userName。否则修改realName
|
|
- SysUser sysUser = sysUserFeignService.queryUserById(userId);
|
|
|
|
|
|
+ SysUser sysUser = sysUserService.queryUserById(userId);
|
|
if(sysUser.getUserType().contains("STUDENT")){
|
|
if(sysUser.getUserType().contains("STUDENT")){
|
|
sysUser.setUsername(nickName);
|
|
sysUser.setUsername(nickName);
|
|
}else {
|
|
}else {
|
|
sysUser.setRealName(nickName);
|
|
sysUser.setRealName(nickName);
|
|
}
|
|
}
|
|
- sysUserFeignService.updateSysUser(sysUser);
|
|
|
|
|
|
+ sysUserService.updateSysUser(sysUser);
|
|
//同步融云基本信息
|
|
//同步融云基本信息
|
|
imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
|
|
imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
|
|
}
|
|
}
|
|
@@ -219,4 +224,25 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
imGroupMemberDao.deleteByImGroupId(imGroupId);
|
|
imGroupMemberDao.deleteByImGroupId(imGroupId);
|
|
imGroupNoticeDao.deleteByImGroupId(imGroupId);
|
|
imGroupNoticeDao.deleteByImGroupId(imGroupId);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<NameDto> queryDetail(List<NameDto> nameDto) {
|
|
|
|
+ List<NameDto> dtos = new ArrayList<>();
|
|
|
|
+ if(CollectionUtils.isNotEmpty(nameDto)){
|
|
|
|
+ Map<Integer, List<NameDto>> collect = nameDto.stream().collect(Collectors.groupingBy(NameDto::getType));
|
|
|
|
+ for (Integer integer : collect.keySet()) {
|
|
|
|
+ List<NameDto> nameDtos = collect.get(integer);
|
|
|
|
+ if(CollectionUtils.isNotEmpty(nameDtos)){
|
|
|
|
+ String idList = nameDtos.stream().map(e -> e.getId()).collect(Collectors.joining(","));
|
|
|
|
+ if(integer.equals(3)){
|
|
|
|
+ dtos.addAll(imGroupDao.queryNameByIds(idList));
|
|
|
|
+ }else if (integer.equals(1)){
|
|
|
|
+ Integer userId = sysUserService.getUserId();
|
|
|
|
+ dtos.addAll(imUserFriendDao.queryNameByIds(idList,userId));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return dtos;
|
|
|
|
+ }
|
|
}
|
|
}
|