封装房间头像接口

gis_cms/src/main/java/com/gis/cms/service/impl/RoomServiceImpl.java

@@ -176,25 +176,31 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
      */
     private void handleAvatarUrlByRoom(List<RoomEntity> rooms) {
         // 房间ids
+        log.info("准备封装用户头像");
         List<Long> collect = rooms.stream().map(RoomEntity::getId).collect(Collectors.toList());
-        List<RoomVo> avatars = getAvatarUrlByRoomId(collect);
-        // 按房间分组
-        Map<Long, List<RoomVo>> roomMap = avatars.stream().collect(Collectors.groupingBy(RoomVo::getRoomId));
-        // 同一房间下的头像
-        List<String> roomImg;
-        for (RoomEntity room : rooms) {
-            List<RoomVo> roomVos = roomMap.get(room.getId());
-            if (CollectionUtil.isNotEmpty(roomVos)){
-                roomImg = new ArrayList<>();
-                for (RoomVo roomVo : roomVos) {
-                    roomImg.add(roomVo.getAvatarUrl());
+
+        if (CollectionUtil.isNotEmpty(collect)){
+            log.info("获取用户头像用户头像");
+            List<RoomVo> avatars = getAvatarUrlByRoomId(collect);
+            // 按房间分组
+            Map<Long, List<RoomVo>> roomMap = avatars.stream().collect(Collectors.groupingBy(RoomVo::getRoomId));
+            // 同一房间下的头像
+            List<String> roomImg;
+            for (RoomEntity room : rooms) {
+                List<RoomVo> roomVos = roomMap.get(room.getId());
+                if (CollectionUtil.isNotEmpty(roomVos)){
+                    roomImg = new ArrayList<>();
+                    for (RoomVo roomVo : roomVos) {
+                        roomImg.add(roomVo.getAvatarUrl());
+                    }
+                    // 更新头像组合
+                    room.setAvatarUrls(roomImg);
                 }
-                // 更新头像组合
-                room.setAvatarUrls(roomImg);
-            }
 
+            }
         }
 
+
     }
 
     /***
@@ -206,7 +212,9 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
         String roomIdsStr = CollectionUtil.join(roomIds, ",");
         StringBuffer sql = new StringBuffer();
         sql.append("select b.avatar_url, a.room_id, b.id as userId from tb_game_log a left join wx_user b on b.id=a.creator_id where a.is_delete=0 and  a.type='activity' ");
-        sql.append(" and a.room_id in (").append(roomIdsStr).append(")");
+        if (StrUtil.isNotBlank(roomIdsStr)){
+            sql.append(" and a.room_id in (").append(roomIdsStr).append(")");
+        }
         // 该房间的用户头像
         return baseMapper.selectVoList(sql.toString());
 
@@ -290,14 +298,16 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
     }
 
     /**
-     * 检查感觉状态
+     * 检查房间状态
      */
     private void checkRoomStatus(){
 
+
         if (redisUtil.hasKey(ROOM_STATUS_KEY)){
             return;
         }
 
+
         // 更新房间状态
         setStatus(1);
         // 30分钟
@@ -309,6 +319,7 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
      * @param status
      */
     private void setStatus(Integer status){
+        log.info("更新房间状态");
         LambdaUpdateWrapper<RoomEntity> ew = new LambdaUpdateWrapper<>();
         ew.set(RoomEntity::getStatus, status)
                 .eq(RoomEntity::getStatus,0)