Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImUserFriend.java

@@ -28,6 +28,10 @@ public class ImUserFriend implements Serializable {
     @ApiModelProperty(value = "当前用户编号")
     private Long userId;
 
+    @TableField("client_type_")
+    @ApiModelProperty(value = "客户端类型")
+    private ClientEnum clientType;
+
     @TableField("friend_id_")
     @ApiModelProperty(value = "好友编号")
     private Long friendId;
@@ -40,10 +44,6 @@ public class ImUserFriend implements Serializable {
     @ApiModelProperty(value = "融云好友编号")
     private String imFriendId;
 
-    @TableField(exist = false)
-    @ApiModelProperty(value = "好友用户身份")
-    private ClientEnum clientType;
-
     @TableField("friend_avatar_")
     @ApiModelProperty(value = "好友头像")
     private String friendAvatar;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.IMHelper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.EStatus;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.utils.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -110,7 +111,14 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //获取房间所有成员
         List<ImNetworkRoomMember> roomMemberList = imNetworkRoomMemberService.getDao().queryByRoomId(roomId);
         for (ImNetworkRoomMember item : roomMemberList) {
-            item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getUserId()), ClientEnum.STUDENT.name()));
+            if (EStatus.ENABLE.match(item.getRole())) {
+                // 老师
+                item.setImUserId(String.valueOf(item.getUserId()));
+            } else {
+                // 学生
+                item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getUserId()), ClientEnum.STUDENT.name()));
+            }
+
         }
         joinRoomResult.setRoomMemberList(roomMemberList);
         //如果是老师，重置节拍器数据

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -336,6 +336,7 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         // 查询用户好友列表
         List<ImUserFriend> records = lambdaQuery()
                 .eq(ImUserFriend::getUserId, userId)
+                .eq(ImUserFriend::getClientType, clientType)
                 .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
                         e -> e.eq(ImUserFriend::getFriendId, search).or().like(ImUserFriend::getFriendNickname, search))
                 .orderByDesc(ImUserFriend::getId).list();

service.md

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