fix

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -296,9 +296,17 @@ public class RoomServiceImpl implements RoomService {
             Boolean exists = redisTemplate.opsForValue().setIfAbsent(joinImGroupKey, roomId, 1L, TimeUnit.DAYS);
 
             if (Optional.ofNullable(exists).orElse(false)) {
-                // 创建群组
-                log.info("createImGroup: roomId = {}, userId = {}", roomId, teacherInfo.getId());
-                pluginService.chatRoomCreate(roomId, courseSchedule.getName(), teacherInfo.getAvatar());
+
+                // 生成群组，更新服务提供方
+                if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
+
+                    // 创建群组
+                    log.info("createImGroup: roomId = {}, userId = {}", roomId, teacherInfo.getId());
+                    pluginService.chatRoomCreate(roomId, courseSchedule.getName(), teacherInfo.getId().toString());
+
+                    // 更新网络课服务提供方
+                    courseScheduleDao.updateServiceProvider(courseSchedule.getId(), rtcServiceProvider);
+                }
 
                 // 群组老师信息
                 List<ImGroupMemberWrapper.ImGroupMember> groupMembers = Lists.newArrayList(ImGroupMemberWrapper.ImGroupMember
@@ -319,16 +327,9 @@ public class RoomServiceImpl implements RoomService {
                     }
                 }
 
-                // 生成群组，更新服务提供方
-                if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
-
-                    // 加入群组成员
-                    log.info("joinImGroup: roomId = {}, userIds = {}", roomId, groupMembers);
-                    pluginService.chatRoomGroupJoin(roomId, courseSchedule.getName(), groupMembers);
-
-                    // 更新网络课服务提供方
-                    courseScheduleDao.updateServiceProvider(courseSchedule.getId(), rtcServiceProvider);
-                }
+                // 加入群组成员
+                log.info("joinImGroup: roomId = {}, serviceProvider={}, userIds = {}", roomId, courseSchedule.getServiceProvider(), groupMembers);
+                pluginService.chatRoomGroupJoin(roomId, courseSchedule.getName(), groupMembers);
 
             }
         }
@@ -1271,7 +1272,7 @@ public class RoomServiceImpl implements RoomService {
             // 发送消息
             if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
                 // 腾讯消息
-                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.DEVICE_MESSAGE).content(messageContent));
+                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
             } else {
                 // 融云消息
                 imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);