|
|
@@ -12,6 +12,7 @@ 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;
|
|
|
@@ -27,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
-import java.util.UUID;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -109,9 +107,12 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String createGroup(ImGroupDto imGroupDto){
|
|
|
List<String> userIdList = imGroupDto.getUserIdList();
|
|
|
+ if (CollectionUtils.isEmpty(userIdList)){
|
|
|
+ Integer currentUserId = sysUserFeignService.queryUserInfo().getId();
|
|
|
+ userIdList.add(currentUserId.toString());
|
|
|
+ }
|
|
|
String groupName = imGroupDto.getGroupName();
|
|
|
String type = imGroupDto.getType();
|
|
|
- Optional.ofNullable(userIdList).filter(CollectionUtils::isNotEmpty).orElseThrow(() -> new BizException("群成员不能为空"));
|
|
|
Optional.ofNullable(groupName).filter(StringUtils::isNotBlank).orElseThrow(() -> new BizException("群名称不能为空"));
|
|
|
Optional.ofNullable(type).filter(StringUtils::isNotBlank).orElseThrow(() -> new BizException("群类型不能为空"));
|
|
|
Date date = new Date();
|
|
|
@@ -139,7 +140,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean cancel(String imGroupId) {
|
|
|
-
|
|
|
// 删除群成员
|
|
|
imGroupMemberDao.deleteByImGroupId(imGroupId);
|
|
|
// 删除群公告
|
zouxuan