|
@@ -1,18 +1,23 @@
|
|
package com.ym.mec.biz.service.impl;
|
|
package com.ym.mec.biz.service.impl;
|
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.Map.Entry;
|
|
import java.util.Map.Entry;
|
|
|
|
+import java.util.Objects;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
|
-import com.ym.mec.util.collection.MapUtil;
|
|
|
|
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 org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
+import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
|
+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.TeacherDao;
|
|
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;
|
|
@@ -22,6 +27,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
import com.ym.mec.im.ImFeignService;
|
|
import com.ym.mec.im.ImFeignService;
|
|
import com.ym.mec.im.entity.GroupMember;
|
|
import com.ym.mec.im.entity.GroupMember;
|
|
import com.ym.mec.im.entity.GroupModel;
|
|
import com.ym.mec.im.entity.GroupModel;
|
|
|
|
+import com.ym.mec.util.collection.MapUtil;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMember> implements ImGroupMemberService {
|
|
public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMember> implements ImGroupMemberService {
|
|
@@ -37,6 +43,9 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ImFeignService imFeignService;
|
|
private ImFeignService imFeignService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysUserFeignService sysUserFeignService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Long, ImGroupMember> getDAO() {
|
|
public BaseDAO<Long, ImGroupMember> getDAO() {
|
|
@@ -56,6 +65,8 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
|
+
|
|
ImGroupMember imGroupMember = new ImGroupMember();
|
|
ImGroupMember imGroupMember = new ImGroupMember();
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
|
|
|
@@ -65,6 +76,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
|
|
imGroupMember.setRoleType(roleType);
|
|
imGroupMember.setRoleType(roleType);
|
|
imGroupMember.setUpdateTime(date);
|
|
imGroupMember.setUpdateTime(date);
|
|
imGroupMember.setUserId(userId);
|
|
imGroupMember.setUserId(userId);
|
|
|
|
+ imGroupMember.setNickname(StringUtils.isBlank(user.getUsername()) ? user.getRealName() : user.getUsername());
|
|
|
|
|
|
imGroupMemberDao.insert(imGroupMember);
|
|
imGroupMemberDao.insert(imGroupMember);
|
|
|
|
|