From 9384bdb69c6035eb3f0e405b70f97817f888655e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 f3a19c4..0a01c2d 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
@@ -2973,14 +2973,24 @@
}
// 获取最近二十天数据
- List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
- serverndays.forEach(date -> {
- // 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAppId(), date);
+ List<Date> activeDate = getTwentyDays();
+
+ String twentyDay = com.panzhihua.common.utlis.DateUtils.getTwentyDay();
+ //获取最近活跃人数
+ List<UsersStatisticsDTO> actives = userDao.selectActive(twentyDay, dataKanBansDto.getAppId());
+ //获取最近注册人数
+ List<UsersStatisticsDTO> dailyAdds = userDao.selectDailyAdd(twentyDay, dataKanBansDto.getAppId());
+
+ 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");
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
- communityActiveUserY.add(dataKanbanDTO.getNum());
- communityActiveUserZ.add(dataKanbanDTO.getDayNum());
- });
+ communityActiveUserY.add(dailyAddMap.containsKey(dateStr) ? Integer.parseInt(dailyAddMap.get(dateStr)) : 0);
+ communityActiveUserZ.add(activeMap.containsKey(dateStr) ? Integer.parseInt(activeMap.get(dateStr)) : 0);
+ }
indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
indexDataKanbanVO.setCommunityAddUserY(communityActiveUserY);
indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserZ);
--
Gitblit v1.7.1