|
@@ -233,12 +233,23 @@ public class DataCountService {
|
|
|
}
|
|
|
List<RoomVisitLog> roomLives = roomVisitLogService.getByRoomId(record.getRoomId());
|
|
|
Long minute = 0L;
|
|
|
+ HashMap<Long,Long> dateMap = new HashMap<>();
|
|
|
for (RoomVisitLog roomLive : roomLives) {
|
|
|
Date overTime = roomLive.getOutRoomTime();
|
|
|
if(overTime == null){
|
|
|
continue;
|
|
|
}
|
|
|
- minute += (roomLive.getOutRoomTime().getTime() - roomLive.getInRoomTime().getTime()) /1000/60;
|
|
|
+ if(dateMap.get(overTime.getTime()) == null){
|
|
|
+ dateMap.put(overTime.getTime(),roomLive.getInRoomTime().getTime());
|
|
|
+ }else {
|
|
|
+ if(roomLive.getInRoomTime().getTime() < dateMap.get(overTime.getTime())){
|
|
|
+ dateMap.put(overTime.getTime(),roomLive.getInRoomTime().getTime());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ for (Long key : dateMap.keySet()) {
|
|
|
+ minute += (key - dateMap.get(key)) /1000/60;
|
|
|
}
|
|
|
RoomListDataVo roomListDataVo = new RoomListDataVo();
|
|
|
roomListDataVo.setRoomTitle(record.getRoomTitle());
|