1

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

@@ -4,9 +4,7 @@ import lombok.Data;
 import lombok.ToString;
 
 @Data
-@ToString
 public class DataCount {
     private String dataKey;
     private Long dataCount;
-    private Integer roomUserId;
 }

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

@@ -122,8 +122,11 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         }
 
         HashMap<String, DataCount> dataCountMap = roomVisitLogService.getGroupByRoomId();
-        log.info("dataCountMap:{}",dataCountMap);
         for (Room record : page.getRecords()) {
+            DataCount dataCount = dataCountMap.get(record.getRoomId());
+            if (dataCount != null) {
+                record.setRoomViewCount(dataCount.getDataCount());
+            }
 
             if (!record.getRoomUserName().equals(param.getUserName())) {
                 RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),param.getUserName());
@@ -140,17 +143,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                         record.setRoomUserName(userInfo.getUserName());
                     }
                     record.setIsHomeOwner(false);
-
-                    DataCount dataCount = dataCountMap.get(record.getRoomId()+"_"+roomUser.getRoomUserId());
-                    log.info("dataCount:{}",dataCount);
-                    if (dataCount != null) {
-                        record.setRoomViewCount(dataCount.getDataCount());
-                    }
-                }else {
-                    DataCount dataCount = dataCountMap.get(record.getRoomId());
-                    if (dataCount != null) {
-                        record.setRoomViewCount(dataCount.getDataCount());
-                    }
                 }
             }
             record.setVisitPassword(null);

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

@@ -110,12 +110,7 @@ public class RoomVisitLogServiceImpl extends ServiceImpl<IRoomVisitLogMapper, Ro
         HashMap<String,DataCount> map = new HashMap<>();
         List<DataCount> groupByRoomId = this.getBaseMapper().getGroupByRoomId();
         for (DataCount dataCount : groupByRoomId) {
-            if(dataCount.getRoomUserId() != null){
-                map.put(dataCount.getDataKey() +"_"+dataCount.getRoomUserId(),dataCount);
-            }else {
-                map.put(dataCount.getDataKey() ,dataCount);
-
-            }
+            map.put(dataCount.getDataKey() ,dataCount);
         }
         return map;
     }

src/main/resources/mapper/tk/RoomVisitLogMapper.xml

@@ -55,8 +55,8 @@
 
     </select>
     <select id="getGroupByRoomId" resultType="com.fdkankan.tk.response.DataCount">
-        select room_id as dataKey ,room_user_id,count(visit_id) as dataCount from t_room_visit_log
-        where tb_status = 0 group by dataKey,room_user_id
+        select room_id as dataKey,count(visit_id) as dataCount from t_room_visit_log
+        where tb_status = 0 group by dataKey
     </select>
     <select id="getDataCountTop5" resultType="com.fdkankan.tk.response.DataCount">
         SELECT  room_id as dataKey,count(1) as dataCount  FROM t_room_visit_log