From 5881996b41d4b905ff455fb31f54c4089bce5b3e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 17:18:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 551fe6a..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<>();
--
Gitblit v1.7.1