Browse Source

群组用户详情

Eric 2 years ago
parent
commit
88ae8a0cce

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImGroupMemberDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import io.rong.models.group.GroupMember;
 import org.apache.ibatis.annotations.Param;
@@ -46,7 +47,7 @@ public interface ImGroupMemberDao extends BaseMapper<ImGroupMember> {
                                            @Param("userIds") Set<Long> userIds,
                                            @Param("roleType") String roleType);
 
-    ImGroupMember findByUserIdAndGroupId(@Param("userId") Long userId, @Param("groupId") String groupId);
+    ImGroupMember findByUserIdAndGroupId(@Param("userId") Long userId, @Param("groupId") String groupId, @Param("clientType") ClientEnum clientType);
 
     //删除群成员
     int delByGroupIdAndUserId(@Param("groupId") String groupId, @Param("userId") Long userId, @Param("roleType") ImGroupMemberRoleType roleType);

+ 8 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberServiceImpl.java

@@ -136,11 +136,17 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
     @Transactional(rollbackFor = Exception.class)
     public ImGroupMember getUserDetail(String imUserId, String groupId) {
 
+        String[] values = imUserId.split(":");
         // 用户ID
-        long userId = Long.parseLong(imUserId.split(":")[0]);
+        long userId = Long.parseLong(values[0]);
+
+        ClientEnum clientType = ClientEnum.TEACHER;
+        if (values.length > 1 && ClientEnum.STUDENT.match(values[1])) {
+            clientType = ClientEnum.STUDENT;
+        }
 
         // 群组信息
-        ImGroupMember imGroupMember = baseMapper.findByUserIdAndGroupId(userId, groupId);
+        ImGroupMember imGroupMember = baseMapper.findByUserIdAndGroupId(userId, groupId, clientType);
 
         // 用户基本信息
         BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMemberMapper.xml

@@ -77,6 +77,6 @@
         </foreach>
     </select>
     <select id="findByUserIdAndGroupId" resultMap="ImGroupMember">
-        SELECT <include refid="Base_Column_List"/> FROM im_group_member WHERE group_id_ = #{groupId} AND user_id_ = #{userId} LIMIT 1
+        SELECT <include refid="Base_Column_List"/> FROM im_group_member WHERE group_id_ = #{groupId} AND user_id_ = #{userId} AND role_type_ = #{clientType} LIMIT 1
     </select>
 </mapper>

+ 3 - 3
service.md

@@ -1,14 +1,14 @@
 - [ ] gateway-server
 - [ ] auth-server
 - [ ] admin-server
-- [ ] teacher-server
-- [ ] student-server
+- [x] teacher-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server
 - [ ] audio-analysis
 - [ ] bbs-server
-- [x] classroom-server
+- [ ] classroom-server
 - [ ] cms-server
 - [ ] mall-admin
 - [ ] mall-server