Eric 2 년 전
부모
커밋
d49cca72c0

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -174,7 +174,8 @@
         cs.valid_start_time_,
         cs.pre_course_flag_,
         cs.tenant_id_,
-        cs.evaluate_flag_
+        cs.evaluate_flag_,
+        cs.service_provider_
     </sql>
 
     <sql id="courseIgnore">

+ 0 - 2
mec-im/src/main/java/com/ym/pojo/Room.java

@@ -26,7 +26,6 @@ public class Room implements Serializable {
     private @Getter @Setter String display;
     private @Getter @Setter int whiteboardNameIndex;
     private @Getter @Setter int soundVolume = 100;
-    private @Getter @Setter String serviceProvider;
 
     @Override
     public String toString() {
@@ -38,7 +37,6 @@ public class Room implements Serializable {
                 ", display='" + display + '\'' +
                 ", soundVolume='" + soundVolume + '\'' +
                 ", whiteboardNameIndex='" + whiteboardNameIndex + '\'' +
-                ", serviceProvider='" + serviceProvider + '\'' +
                 '}';
     }
 }

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

@@ -269,7 +269,7 @@ public class RoomServiceImpl implements RoomService {
         String rtcServiceProvider = Optional.ofNullable(sysConfigDao.findConfigValue("rtc_service_provider")).orElse("rongCloud");
 
         RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(rtcServiceProvider);
-        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(rtcServiceProvider)) {
+        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
             // 腾讯云RTC
             // 用户IM帐号创建
             String userSig = "";
@@ -319,12 +319,17 @@ public class RoomServiceImpl implements RoomService {
                     }
                 }
 
-                // 加入群组成员
-                log.info("joinImGroup: roomId = {}, userIds = {}", roomId, groupMembers);
-                pluginService.chatRoomGroupJoin(roomId, courseSchedule.getName(), groupMembers);
+                // 生成群组,更新服务提供方
+                if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
+
+                    // 加入群组成员
+                    log.info("joinImGroup: roomId = {}, userIds = {}", roomId, groupMembers);
+                    pluginService.chatRoomGroupJoin(roomId, courseSchedule.getName(), groupMembers);
+
+                    // 更新网络课服务提供方
+                    courseScheduleDao.updateServiceProvider(courseSchedule.getId(), rtcServiceProvider);
+                }
 
-                // 更新网络课服务提供方
-                courseScheduleDao.updateServiceProvider(courseSchedule.getId(), rtcServiceProvider);
             }
         }