|
@@ -9,14 +9,11 @@ import com.ym.mec.biz.dal.dto.ImGroupDto;
|
|
|
import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
|
|
|
import com.ym.mec.biz.dal.entity.ImGroup;
|
|
|
import com.ym.mec.biz.dal.entity.ImGroupMember;
|
|
|
-import com.ym.mec.biz.dal.page.GroupMemberQueryInfo;
|
|
|
import com.ym.mec.biz.service.ImGroupMemberService;
|
|
|
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.entity.ImUserModel;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
-import com.ym.mec.common.page.PageInfo;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import com.ym.mec.common.tenant.TenantContextHolder;
|
|
|
import com.ym.mec.im.ImFeignService;
|
|
@@ -28,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
+import java.util.UUID;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -107,8 +107,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String createGroup(ImGroupDto imGroupDto){
|
|
|
List<String> userIdList = imGroupDto.getUserIdList();
|
|
|
+ Integer currentUserId = null;
|
|
|
if (CollectionUtils.isEmpty(userIdList)){
|
|
|
- Integer currentUserId = sysUserFeignService.queryUserInfo().getId();
|
|
|
+ currentUserId = sysUserFeignService.queryUserInfo().getId();
|
|
|
userIdList.add(currentUserId.toString());
|
|
|
}
|
|
|
String groupName = imGroupDto.getGroupName();
|
|
@@ -121,6 +122,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
imGroup.setId(groupId);
|
|
|
imGroup.setCreateTime(date);
|
|
|
imGroup.setIntroduce(groupName);
|
|
|
+ imGroup.setMemo(groupName);
|
|
|
imGroup.setMemberNum(userIdList.size());
|
|
|
imGroup.setName(groupName);
|
|
|
imGroup.setType(type);
|
|
@@ -128,6 +130,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
imGroup.setUpdateTime(date);
|
|
|
imGroupDao.insert(imGroup);
|
|
|
List<ImGroupMember> groupMemberList = imGroupMemberDao.queryMembers(groupId, userIdList, TenantContextHolder.getTenantId());
|
|
|
+ if(currentUserId != null){
|
|
|
+ groupMemberList.get(0).setRoleType("乐团主管");
|
|
|
+ }
|
|
|
imGroupMemberDao.batchInsert(groupMemberList);
|
|
|
Function<String,GroupMember> newGroup = userId ->new GroupMember(userId, groupId);
|
|
|
List<GroupMember> groupMembers = userIdList.stream().map(newGroup).collect(Collectors.toList());
|