From 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 11 七月 2022 09:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 9e94005..f672605 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
@@ -3301,6 +3301,14 @@
}
@Override
+ public R checkExport(String account, String password,String oldPassword) {
+ if(new BCryptPasswordEncoder().matches(password, oldPassword)){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
public R newIndexData(Integer type, Long streetId) {
IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
IndexDataAnalysisVO vo=new IndexDataAnalysisVO();
@@ -3349,7 +3357,12 @@
vo.setRealUsersMonth(realUsersMonth);
vo.setRealUser(getStreetRealUser(realUsersTotal));
vo.setRealUserRate(getRate(vo.getAllUser(),vo.getRealUser()));
- vo.setUserActivityXAll(getTwentyDays());
+ List<Date> twentyDays = getTwentyDays();
+ SimpleDateFormat sdf1=new SimpleDateFormat("MM");
+ for (Date twentyDay : twentyDays) {
+ sdf1.format(twentyDay);
+ }
+ vo.setUserActivityXAll(getTwentyDays());
vo.setUserActivityXMonth(getMonthTwentyDays());
List<String> addUserYAll=new ArrayList<>();
List<String> addUserYMonth=new ArrayList<>();
@@ -3374,8 +3387,8 @@
vo.setActiveUserYMonth(activeUserYMonth);
if (type.equals(BYSTREET) || type.equals(ALLCOMMUNITY) || type.equals(ALLSTREET)){
//获取其他用户
- vo.setOtherUser(indexDataKanbanVO.getAllUser()-vo.getAllUser());
- vo.setOtherUserRate(getRate(indexDataKanbanVO.getAllUser(),vo.getAllUser()));
+ vo.setOtherUser(indexDataKanbanVO.getAllUser()-countUser(vo.getUserProportionTotal()));
+ vo.setOtherUserRate(getRate(indexDataKanbanVO.getAllUser(),vo.getOtherUser()));
}
return R.ok(vo);
}
@@ -3426,7 +3439,7 @@
private Double getRate(Integer total,Integer count){
if (0 != total && null != total){
if (0 != count && null != count){
- BigDecimal div = NumberUtil.div(count.toString(), total.toString(),1);
+ BigDecimal div = NumberUtil.div(count.toString(), total.toString(),2);
return div.doubleValue();
}
}
@@ -3451,4 +3464,21 @@
return count;
}
+ /**
+ * 计算当前统计范围内的所有用户数
+ * */
+ public Integer countUser(List<UserProportion> list){
+ Integer count=0;
+ if (list.size()>0){
+ for (UserProportion proportion : list) {
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(proportion)){
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(proportion.getUser())){
+ count+=proportion.getUser();
+ }
+ }
+ }
+ }
+ return count;
+ }
+
}
--
Gitblit v1.7.1