From a9674f2fdd767d37a920e08535d8ab7d88746796 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 十二月 2023 14:21:52 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 868fadd..f07dc5a 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -141,7 +141,7 @@
date = calendar.getTime();
umsAdmin.setExpirationDate(date);
} else {
- umsAdmin.setExpirationDate(new Date(2090,1,1));
+ umsAdmin.setExpirationDate(new Date(2090, 1, 1));
}
if (umsAdmin.getId() != null) {
baseMapper.updateById(umsAdmin);
@@ -286,6 +286,25 @@
admin.setPasswordErrorNum(0);
updateById(admin);
+ UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+ //鏍规嵁鐢ㄦ埛id锛岀敤鎴峰鍚�
+ token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
+ redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
+// updateLoginTimeByUsername(username);
+ //insertLoginLog(username);
+ } catch (AuthenticationException e) {
+ LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage());
+ }
+ return token;
+ }
+
+ @Override
+ public String getOAuthToken(String username) {
+ String token = null;
+ //瀵嗙爜闇�瑕佸鎴风鍔犲瘑鍚庝紶閫�
+ try {
+ AdminUserDetails userDetails = (AdminUserDetails) loadUserByUsername(username);
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
SecurityContextHolder.getContext().setAuthentication(authentication);
//鏍规嵁鐢ㄦ埛id锛岀敤鎴峰鍚�
@@ -568,6 +587,27 @@
@Override
public List<UmsAdmin> getDepartUser(Long departId) {
+// //TODO锛氭煡璇簩绾ч儴闂ㄥ強鎵�鏈夊瓙绾ч儴闂�
+// List<UmsDepart> umsDeparts = umsDepartManageMapper.selectChildrendIds(departId);
+// List<Long> parentIds = umsDeparts.stream().map(UmsDepart::getParentId).collect(Collectors.toList());
+// List<Long> ids = umsDeparts.stream().map(UmsDepart::getId).collect(Collectors.toList());
+// List<Long> departIds = new ArrayList<>();
+// for (Long id : ids) {
+// if(!parentIds.contains(id)){
+// departIds.add(id);
+// }
+// }
+//
+// QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
+// wrapper.lambda().in(UmsDepartManage::getDepartId, departIds);
+// List<UmsDepartManage> users = umsDepartManageMapper.selectList(wrapper);
+//
+// List<Long> userIds = users.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
+//
+// QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
+// wrapperUser.in("id", userIds);
+// List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
+// return adminList;
QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
@@ -596,5 +636,10 @@
return str;
}
+ @Override
+ public UmsAdmin getByOpenid(String openid) {
+ LambdaQueryWrapper<UmsAdmin> wrapper = new LambdaQueryWrapper<UmsAdmin>().eq(UmsAdmin::getOpenid, openid).last("limit 1");
+ return baseMapper.selectOne(wrapper);
+ }
}
--
Gitblit v1.8.0