From a6039dd43de890a85d3586c044a23378b12cca02 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 27 一月 2021 13:49:59 +0800
Subject: [PATCH] 随手拍
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 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 db6ae42..4d06e46 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.*;
@@ -410,6 +411,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);
}
@@ -1163,10 +1168,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);
@@ -1296,6 +1306,24 @@
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();
+ }
+
public static void main(String[] args) {
String encode = new BCryptPasswordEncoder().encode("lbsq123456");
--
Gitblit v1.7.1