1

src/main/java/com/fdkankan/tk/response/RoomData.java

@@ -7,5 +7,5 @@ public class RoomData {
     private Long roomCount = 0L;
     private Long visitManCount = 0L;
     private Long visitCount = 0L;
-    private Long shareCount = 0L;
+    private Integer shareCount = 0;
 }

src/main/java/com/fdkankan/tk/response/RoomListDataVo.java

@@ -35,7 +35,7 @@ public class RoomListDataVo {
     private Long lookManCount;
 
     @ExcelProperty("分享总数")
-    private Long shareCount;
+    private Integer shareCount;
 
     public String getRoomStatusStr() {
         if(roomStatus == null){

src/main/java/com/fdkankan/tk/service/DataCountService.java

@@ -57,7 +57,10 @@ public class DataCountService {
         if(roomIds.size() >0){
             wrapper3.in(RoomShareLog::getRoomId,roomIds);
         }
-        Long shareCount = roomShareLogService.count(wrapper3);
+        Integer shareCount = 0 ;
+        for (Room room : roomList) {
+            shareCount += room.getShareCount();
+        }
 
         RoomData roomData = new RoomData();
         roomData.setRoomCount(roomCount);
@@ -221,10 +224,6 @@ public class DataCountService {
         HashMap<String,Long> roomManMap = new HashMap<>();
         roomList.forEach(entity -> roomManMap.put(entity.getDataKey(),entity.getDataCount()));
 
-        List<DataCount> roomShareList = roomShareLogService.getGroupByRoomId();
-        HashMap<String,Long> roomShareMap = new HashMap<>();
-        roomShareList.forEach(entity -> roomShareMap.put(entity.getDataKey(),entity.getDataCount()));
-
         for (Room record : page.getRecords()) {
             List<RoomNum> roomNums = numRoomMap.get(record.getRoomId());
             List<String> sceneTileList = new ArrayList<>();
@@ -252,7 +251,7 @@ public class DataCountService {
             roomListDataVo.setRoomStatus(record.getRoomStatus());
             roomListDataVo.setLookTime(minute);
             roomListDataVo.setLookManCount(roomManMap.get(record.getRoomId()) == null ? 0L:roomManMap.get(record.getRoomId()) );
-            roomListDataVo.setShareCount(roomShareMap.get(record.getRoomId()) == null ? 0L:roomShareMap.get(record.getRoomId()) );
+            roomListDataVo.setShareCount(record.getShareCount());
             voList.add(roomListDataVo);
         }
         Page<RoomListDataVo> pageVo = new Page<>(pageNum,pageSize);
@@ -282,7 +281,7 @@ public class DataCountService {
 
         Page<UserMsgVo> page = roomDanmakuService.pageList(new Page<>(pageNum,pageSize) ,roomIds,startTime,endTime);
         Set<String> roomIdsVo = page.getRecords().stream().map(UserMsgVo::getRoomId).collect(Collectors.toSet());
-        HashMap<String, Room> roomHashMap = roomService.getByIds(roomIdsDb);
+        HashMap<String, Room> roomHashMap = roomService.getByIds(roomIdsVo);
 
         HashMap<String,List<RoomVisitLog>> roomVisitLogsMap = new HashMap<>();
         HashMap<String,List<RoomDanmaku>> danmakusMap = new HashMap<>();

src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -12,6 +12,7 @@ import com.fdkankan.tk.response.RoomVo;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -43,7 +44,7 @@ public interface IRoomService extends IService<Room> {
 
     void stopRoom(String roomId,Integer roomUserId);
 
-    HashMap<String, Room> getByIds(List<String> roomIds);
+    HashMap<String, Room> getByIds(Set<String> roomIds);
 
     List<Room> getLikeTitle(String roomTitle);
 

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -1,10 +1,7 @@
 package com.fdkankan.tk.service.impl;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
@@ -414,7 +411,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public HashMap<String, Room> getByIds(List<String> roomIds) {
+    public HashMap<String, Room> getByIds(Set<String> roomIds) {
         HashMap<String,Room> map = new HashMap<>();
         if(roomIds.size() >0){
             List<Room> rooms = this.listByIds(roomIds);