diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index e2aee5e3..8cffcd84 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -54,8 +55,13 @@ public class OnlineMemberStatistics implements EveryHourExecute { calendar.set(Calendar.MILLISECOND, 0); Calendar finalCalendar = calendar; + + AtomicReference lastNum = new AtomicReference<>(1); onlineMemberVOS = onlineMemberVOS.stream() - .filter(onlineMemberVO -> onlineMemberVO.getDate().after(finalCalendar.getTime())) + .filter(onlineMemberVO -> { + lastNum.set(onlineMemberVO.getNum()); + return onlineMemberVO.getDate().after(finalCalendar.getTime()); + }) .collect(Collectors.toList()); //计入新数据 @@ -63,7 +69,7 @@ public class OnlineMemberStatistics implements EveryHourExecute { calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MILLISECOND, 0); - onlineMemberVOS.add(new OnlineMemberVO(calendar.getTime(), cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size())); + onlineMemberVOS.add(new OnlineMemberVO(calendar.getTime(), cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size(), lastNum.get())); //写入缓存 cache.put(CachePrefix.ONLINE_MEMBER.getPrefix(), onlineMemberVOS); @@ -95,7 +101,7 @@ public class OnlineMemberStatistics implements EveryHourExecute { onlineMemberVOS = onlineMemberVOS.stream() .filter(onlineMemberVO -> onlineMemberVO.getDate().after(calendar.getTime())) .collect(Collectors.toList()); - onlineMemberVOS.add(new OnlineMemberVO(time, num)); + onlineMemberVOS.add(new OnlineMemberVO(time, num, num)); //写入缓存 cache.put(CachePrefix.ONLINE_MEMBER.getPrefix(), onlineMemberVOS); diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java index fc66d9da..bd20847b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java @@ -3,6 +3,7 @@ package cn.lili.modules.statistics.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @AllArgsConstructor +@NoArgsConstructor public class OnlineMemberVO { /** @@ -27,4 +29,9 @@ public class OnlineMemberVO { */ private Integer num; + /** + * 上一周期在线会员人数 + */ + private Integer lastNum; + } diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java index 9b0e69c7..f1263659 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java @@ -142,7 +142,7 @@ public class PlatformViewServiceImpl extends ServiceImpl