Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/resources/config/mybatis/ImLiveBroadcastRoomMemberMapper.xml

@@ -60,10 +60,10 @@
         </if>
         <if test="param.visitorQuery != null">
             <if test="param.visitorQuery == 1">
-                AND ib.fingerprint_ IS NOT NULL
+                AND a.fingerprint_ IS NOT NULL
             </if>
             <if test="param.visitorQuery == 0">
-                AND ib.fingerprint_ IS NULL
+                AND a.fingerprint_ IS NULL
             </if>
         </if>
         group by a.user_id_

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -38,7 +38,7 @@ public class RoomController{
     })
     @GetMapping(value = "/info")
     public BaseResponse getRoomInfo(@RequestParam String roomId) throws Exception {
-        return roomService.joinRoom(roomId, false);
+        return roomService.joinRoom(roomId.substring(1), false);
     }
 
     @RequestMapping(value = "/signIn", method = RequestMethod.POST)

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

@@ -266,6 +266,8 @@ public class RoomServiceImpl implements RoomService {
                 courseScheduleStudentPaymentDao.adjustPlayMidi(courseId, null, null);
             }
             userName = member.getName();
+            //userResult.setRole(member.getRole());
+            userResult.setMicrophone(member.isMic());
             userResult.setCamera(member.isCamera());
             userResult.setHandUpOn(member.isHand());
             userResult.setJoinTime(member.getJoinDt());
@@ -428,6 +430,16 @@ public class RoomServiceImpl implements RoomService {
                 log.info("createImGroup: roomId = {}, userId = {}", roomId, actualTeacherId);
                 if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 
+                    // 群组帐号注册
+                    Teacher teacher = teacherDao.get(courseSchedule.getTeacherId());
+                    if (Objects.nonNull(teacher)) {
+                        try {
+                            pluginService.register(courseSchedule.getTeacherId().toString(), teacher.getRealName(), teacher.getAvatar());
+                        } catch (Exception e) {
+                            log.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
+                        }
+                    }
+
                     // 生成群组
                     pluginService.chatRoomCreate(roomId, courseSchedule.getName(), courseSchedule.getTeacherId().toString());