From 91f5824136b8a70551c95cad2ad624aa41939ddf Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 03 二月 2021 14:35:27 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 14 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 db6ae42..04b150a 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
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
@@ -22,6 +23,8 @@
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -410,6 +413,10 @@
comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
});
loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+ ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
+ if (!ObjectUtils.isEmpty(comActVO)) {
+ loginUserInfoVO.setCommunityName(comActVO.getName());
}
return R.ok(loginUserInfoVO);
}
@@ -804,7 +811,7 @@
e.printStackTrace();
log.error("编辑后台用户出错【{}】",e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- return R.fail("手机号已经存在");
+ return R.fail("此手机号已被占用，请更换其他手机号码");
}
}
if (update>0&&null!=roleDO) {
@@ -1163,10 +1170,15 @@
List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>();
List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt));
if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) {
+ List<Integer> typeList=new ArrayList<>(4);
sysUserNoticeDOS.forEach(sysUserNoticeDO -> {
- SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
- BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
- sysUserNoticeVOList.add(sysUserNoticeVO);
+ Integer type = sysUserNoticeDO.getType();
+ if (!typeList.contains(type)) {
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
+ sysUserNoticeVOList.add(sysUserNoticeVO);
+ typeList.add(type);
+ }
});
}
noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList);
@@ -1194,7 +1206,7 @@
public R dataKanban() {
IndexDataKanbanVO indexDataKanbanVO=userDao.selectIndexDataKanban();
List<DataKanbanDTO> dataKanbanDTOS=userDao.selectCommunityUserOrder();
- List<DataKanbanDTO> dataKanbanDTOS1=userDao.selectCommunityActiveUserOrder();
+
List<String> communityUserX=new ArrayList<>();
List<Integer> communityUserY=new ArrayList<>();
List<String> communityActiveUserX=new ArrayList<>();
@@ -1205,17 +1217,33 @@
communityUserY.add(dataKanbanDTO.getNum());
});
}
- if (!ObjectUtils.isEmpty(dataKanbanDTOS1)) {
- dataKanbanDTOS1.forEach(dataKanbanDTO -> {
- communityActiveUserX.add(dataKanbanDTO.getName());
- communityActiveUserY.add(dataKanbanDTO.getNum());
- });
- }
+// 获取最近七天数据
+ List<Date> serverndays=this.getServenDays();
+ serverndays.forEach(date -> {
+ // 查询社区活动数量
+ DataKanbanDTO dataKanbanDTO=userDao.selectCommunityActiveUserOrder(date);
+ communityActiveUserX.add(DateFormatUtils.format(date,"MM-dd"));
+ communityActiveUserY.add(dataKanbanDTO.getNum());
+ });
indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserY);
indexDataKanbanVO.setCommunityUserX(communityUserX);
indexDataKanbanVO.setCommunityUserY(communityUserY);
return R.ok(indexDataKanbanVO);
+ }
+
+ /**
+ * 获取最近七天数据
+ * @return
+ */
+ private List<Date> getServenDays() {
+ List<Date>dates=new ArrayList<>();
+ Date date=new Date();
+ for(int i=6;i>=0;i--){
+ Date date1= DateUtils.addDays(date,-i);
+ dates.add(date1);
+ }
+ return dates;
}
/**
@@ -1296,12 +1324,51 @@
return R.ok(sysUserAgreementVO);
}
+ /**
+ * 维护用户最后登录时间
+ *
+ * @param userId 用户主键
+ * @return 维护结果
+ */
+ @Override
+ public R putUserLastLoginTime(Long userId) {
+ SysUserDO sysUserDO=new SysUserDO();
+ sysUserDO.setUserId(userId);
+ sysUserDO.setLastLoginTime(new Date());
+ int update = userDao.updateById(sysUserDO);
+ if (update>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 删除意见反馈
+ *
+ * @param id 主键
+ * @return 删除结果
+ */
+ @Override
+ public R deleteFeedback(Long id) {
+ int delete = sysUserFeedbackDAO.deleteById(id);
+ if (delete>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
public static void main(String[] args) {
- String encode = new BCryptPasswordEncoder().encode("lbsq123456");
- System.out.println(encode);
+// String encode = new BCryptPasswordEncoder().encode("lbsq123456");
+// System.out.println(encode);
-
+ List<Date>dates=new ArrayList<>();
+ Date date=new Date();
+ for(int i=6;i>=0;i--){
+ Date date1= DateUtils.addDays(date,-i);
+ dates.add(date1);
+ }
+ System.out.println(dates);
// BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
// boolean matches = encoder.matches("admin1234567", encode);
--
Gitblit v1.7.1