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

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveBroadcastRoomService.java

@@ -47,7 +47,7 @@ public interface ImLiveBroadcastRoomService extends IService<ImLiveBroadcastRoom
 
     void createLiveRoom();
 
-    String test(String roomUid, Integer userId);
+    Map<String, Object> test(String roomUid, Integer userId);
 
     /**
     * @description: 分享直播链接

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -251,15 +251,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             for (EmployeeDto employeeDto : dataList) {
                 employeeDto.setPositionIds(positionMap.get(employeeDto.getId()));
                 employeeDto.setPositionNames(positionNameMap.get(employeeDto.getId()));
+                //平台账户查询所拥有的机构
+                if(Objects.nonNull(queryInfo.getTenantId()) && queryInfo.getTenantId() == -1){
+                    employeeDto.setUserTenantList(sysUserTenantService.queryUserTenant(employeeDto.getId()));
+                }
                 if (StringUtils.isBlank(employeeDto.getOrganIdStr())) {
                     continue;
                 }
                 List<Integer> organIds = Arrays.stream(employeeDto.getOrganIdStr().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                 allOrganIds.addAll(organIds);
-                //平台账户查询所拥有的机构
-                if(Objects.nonNull(queryInfo.getTenantId()) && queryInfo.getTenantId() == -1){
-                    employeeDto.setUserTenantList(sysUserTenantService.queryUserTenant(employeeDto.getId()));
-                }
             }
             if (!CollectionUtils.isEmpty(allOrganIds)) {
                 List<Organization> allOrgans = organizationDao.findOrgans(allOrganIds);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -141,7 +141,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     public PageInfo<ImLiveBroadcastRoomVo> queryPage(Map<String, Object> param) {
         Page<ImLiveBroadcastRoomVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setDesc("a.created_time_");
-        param.put("tenantId",TenantContextHolder.getTenantId());
+        param.put("tenantId", TenantContextHolder.getTenantId());
         IPage<ImLiveBroadcastRoomVo> page = baseMapper.queryPage(pageInfo, param);
         return PageUtil.pageInfo(page);
     }
@@ -257,7 +257,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             ImLiveBroadcastRoomMember member = new ImLiveBroadcastRoomMember();
             member.setTenantId(v.getTenantId());
             member.setRoomUid(roomUid);
-            member.setUserId(userId);
+            member.setUserId(v.getUserId());
             member.setJoinTime(v.getFirstJoinTime());
             member.setTotalTime(v.getTotalViewTime());
             memberList.add(member);
@@ -568,41 +568,46 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     /**
      * 测试
      */
-    public String test(String roomUid, Integer userId) {
-        String result = "roomUid: " + roomUid + "  userId : " + userId + "  ";
+    public Map<String, Object> test(String roomUid, Integer userId) {
+        Map<String, Object> result = new HashMap<>();
         //点赞
         Object like = redissonClient.getBucket(LIVE_ROOM_LIKE.replace(ROOM_UID, roomUid)).get();
         if (Objects.isNull(like)) {
             like = 0;
         }
         //0用户数量
-        RList<Object> list = redissonClient.getList(LIVE_ROOM_USER_LIST.replace(ROOM_UID, roomUid));
-        int size = list.size();
+        RList<RoomUserInfoVo> userList = redissonClient.getList(LIVE_ROOM_USER_LIST.replace(ROOM_UID, roomUid));
+        int size = userList.size();
         //0累计总用户数量
-        int totalLook = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid)).size();
-        result = result + " 点赞数量:" + like + "  用户数量:" + size + "  累计总用户数量:" + totalLook + ">>>>>>>>>>>>";
-
-        //获取用户信息
+        RMap<Integer, RoomUserInfoVo> totalUserCache = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
+        int totalLook = totalUserCache.size();
+        Map<String, Object> roomDataCacheMap = new HashMap<>();
+        roomDataCacheMap.put("点赞数", like);
+        roomDataCacheMap.put("实时观看数", size);
+        roomDataCacheMap.put("总观看人数", totalLook);
+
+        //获取主讲人信息
         RBucket<RoomSpeakerInfo> speakerCache = redissonClient.getBucket(LIVE_SPEAKER_INFO.replace(USER_ID, userId.toString()));
         if (speakerCache.isExists()) {
-            RoomSpeakerInfo roomSpeakerInfo = speakerCache.get();
-            result = result + "  主讲人信息:" + "createRoomTime :" + DateUtil.dateToString(roomSpeakerInfo.getCreateRoomTime(), DateUtil.EXPANDED_DATE_TIME_FORMAT) +
-                    "joinRoomTime :" + DateUtil.dateToString(roomSpeakerInfo.getJoinRoomTime(), DateUtil.EXPANDED_DATE_TIME_FORMAT) +
-                    ",roomUid:" + roomSpeakerInfo.getRoomUid() + ",speakerId:" + roomSpeakerInfo.getSpeakerId() + ",speakerName:" + roomSpeakerInfo.getSpeakerName() +
-                    ",tenantId:" + roomSpeakerInfo.getTenantId() + " ,totalLiveTime:" + roomSpeakerInfo.getTotalLiveTime() + ", whetherVideo:" + roomSpeakerInfo.getWhetherVideo()
-                    + ">>>>>>>>>>>>";
+            result.put("主讲人信息", speakerCache.get());
         } else {
-            result = result + "  主讲人信息:" + "主讲人信息不存在" + ">>>>>>>>>>>>";
+            result.put("主讲人信息", "主讲人信息不存在");
+        }
+        //获取实时观看人信息
+        if (userList.isExists()) {
+            result.put("正在观看的人员信息", userList.get());
+        } else {
+            result.put("正在观看的人员信息", "没有正在观看的人员数据");
         }
-
         //获取总用户信息
-        RMap<Integer, RoomUserInfoVo> roomTotalUser = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
-        if (roomTotalUser.isExists()) {
-            List<RoomUserInfoVo> collect = new ArrayList<>(roomTotalUser.values());
-            result = result + "  总人员信息：" + JSONObject.toJSONString(collect);
+        if (totalUserCache.isExists()) {
+            result.put("总人员数据", totalUserCache.values());
         } else {
-            result = result + "  总人员信息：" + "总人员信息不存在" + ">>>>>>>>>>>>";
+            result.put("总人员数据", "没有人员数据");
         }
+
+        result.put("roomDataCacheMap", roomDataCacheMap);
+
         return result;
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/ImLiveBroadcastRoomController.java

@@ -146,8 +146,8 @@ public class ImLiveBroadcastRoomController extends BaseController {
     }
 
     @GetMapping("/test")
-    public HttpResponseResult test(String roomUid, Integer userId) {
-        return succeed(imLiveBroadcastRoomService.test(roomUid, userId));
+    public Object test(String roomUid, Integer userId) {
+        return imLiveBroadcastRoomService.test(roomUid, userId);
     }
 
     @GetMapping("/shareGroup")