Merge branch 'feature/0414-trtc' of http://git.dayaedu.com/yonge/mec into feature/0414-trtc

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

@@ -378,15 +378,8 @@ public class RoomServiceImpl implements RoomService {
             log.info("createImGroup: roomId = {}, userId = {}", roomId, actualTeacherId);
             if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 
-                try {
-                    // 生成群组，更新服务提供方
-                    pluginService.chatRoomCreate(roomId, courseSchedule.getName(), actualTeacherId.toString());
-                } catch (Exception e) {
-                    log.error("joinImGroup TENCENT_CLOUD error: roomId = {}, userId = {}", roomId, actualTeacherId, e);
-                }
-
-                // 更新网络课服务提供方
-                courseScheduleDao.updateServiceProvider(courseSchedule.getId(), courseSchedule.getServiceProvider());
+                // 生成群组
+                pluginService.chatRoomCreate(roomId, courseSchedule.getName(), courseSchedule.getTeacherId().toString());
 
                 // 群组老师信息
                 List<ImGroupMemberWrapper.ImGroupMember> groupMembers = Lists.newArrayList(ImGroupMemberWrapper.ImGroupMember
@@ -419,6 +412,8 @@ public class RoomServiceImpl implements RoomService {
                 imHelper.joinGroup(integers, roomId, roomId);
             }
 
+            // 更新网络课服务提供方
+            courseScheduleDao.updateServiceProvider(courseSchedule.getId(), courseSchedule.getServiceProvider());
         }
 
     }
@@ -1392,7 +1387,7 @@ public class RoomServiceImpl implements RoomService {
             // 发送消息
             if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
                 // 腾讯消息
-                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
+                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(notifyContent));
             } else {
                 // 融云消息
                 imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);