From 6b5816393c74dc6b518e67db8b8693aee61ffec4 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 17 十月 2022 11:57:18 +0800 Subject: [PATCH] #feat 修改 --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java index daa5805..c030bcc 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java @@ -3463,7 +3463,6 @@ activeDate = getMonthTwentyDays(); } } - //获取最近活跃人数 List<UsersStatisticsDTO> actives = userDao.getActive(activeX, streetId, areaCode, appId); //获取最近注册人数 @@ -3471,10 +3470,11 @@ Map<String, String> activeMap = actives.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal)); Map<String, String> dailyAddMap = dailyAdds.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal)); + for (Date date : activeDate) { String dateStr = DateUtil.format(date, "yyyy-MM-dd"); - activeY.add(activeMap.containsKey(dateStr) ? activeMap.get("activeUser").toString() : "0"); - adY.add(dailyAddMap.containsKey(dateStr) ? dailyAddMap.get("addUser").toString() : "0"); + activeY.add(activeMap.containsKey(dateStr) ? activeMap.get(dateStr) : "0"); + adY.add(dailyAddMap.containsKey(dateStr) ? dailyAddMap.get(dateStr) : "0"); } vo.setUserX(getMAndD(activeDate)); -- Gitblit v1.7.1