zouxuan 2 년 전
부모
커밋
8472429ebb

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

@@ -446,7 +446,6 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     public void display(ImNetworkDisplayDataDto displayData) throws Exception {
         log.info("display in data = {}", displayData);
         CourseSchedule courseSchedule = courseScheduleService.getById(displayData.getRoomId());
-        displayData.setUserId(displayData.getUserId());
         displayData.setTeacherId(imGroupService.getImUserId(courseSchedule.getTeacherId(),RoleEnum.RoleTeacher));
         roomService.display(displayData,courseSchedule.getServiceProvider());
     }

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

@@ -100,10 +100,9 @@ public class ImServiceImpl implements ImService {
     @Override
     public void sendDisplay(String imUserId, ImNetworkRoom room,String serviceProvider) throws Exception {
         // IM发送用户消息
-        RoleEnum roleEnum = "TEACHER".equals(imGroupService.analysisImUserClient(imUserId))?RoleEnum.RoleTeacher:RoleEnum.RoleStudent;
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.lambdaQuery().eq(ImNetworkRoomMember::getUserId, imUserId)
                 .eq(ImNetworkRoomMember::getRoomId, room.getRoomId())
-                .eq(ImNetworkRoomMember::getRole,roleEnum.getValue())
+                .eq(ImNetworkRoomMember::getRole,RoleEnum.RoleTeacher.getValue())
                 .last("LIMIT 1").one();
         if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(serviceProvider) || StringUtils.isEmpty(serviceProvider)) {
             // 获取RTC服务提供方

+ 3 - 5
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RoomServiceImpl.java

@@ -164,22 +164,20 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
                 display = new StringBuffer();
                 break;
             case TEACHER:
-                display.append(displayData.getTeacherId()).append("?uri=");
-                break;
             case SCREEN:
-                display.append(displayData.getUserId()).append("?uri=");
+                display.append(displayData.getTeacherId()).append("?uri=");
                 break;
             case STUDENT:
                 display.append(displayData.getUserId()).append("?uri=").append(displayData.getUri());
                 break;
             default:
-                display.append(displayData.getUserId()).append("?uri=").append(displayData.getUri());
+                display.append(displayData.getTeacherId()).append("?uri=").append(displayData.getUri());
                 break;
         }
         ImNetworkRoom room = baseMapper.findByRoomId(displayData.getRoomId());
         room.setDisplay(display.toString());
 
-        this.updateDisplay(displayData.getUserId(),room,serviceProvider);
+        this.updateDisplay(displayData.getTeacherId(),room,serviceProvider);
     }
 
     public boolean isUserDisplay(String display, String imUserId) {