From 254dc4d9b8d903246483297ed0799290f856f0de Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 七月 2022 17:28:43 +0800
Subject: [PATCH] 便捷登录
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 8425352..8a27dd5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,8 +1,10 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.qcloud.cos.utils.Md5Utils;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -12,17 +14,16 @@
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.param.UserPwsParm;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.security.authcode.MD5Util;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.Admin;
-import com.sandu.ximon.dao.domain.AdminRoleRelation;
-import com.sandu.ximon.dao.domain.Role;
-import com.sandu.ximon.dao.domain.RoleMenuRelation;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
+import lombok.Data;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -274,36 +275,67 @@
*/
public List<MenuNode> getUserPermissionList() {
List<MenuNode> resultList;
- //鍒ゆ柇瓒呯涓庢櫘閫氱鐞嗗憳
- if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.ADMIN.getCode())) {
- //鍙傛暟涓簄ull鏃讹紝鑾峰彇鎵�鏈夌殑鑿滃崟鏉冮檺
- resultList = SpringContextHolder.getBean(MenuService.class).getUserPermissionListById(null);
- } else {
- //閫氳繃鐢ㄦ埛UserID鑾峰彇鐢ㄦ埛瑙掕壊
- AdminRoleRelation one = SpringContextHolder.getBean(AdminRoleRelationService.class).
- getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, SecurityUtils.getUserId()));
- //鍒ょ┖
- if (one == null) {
- throw new BusinessException("璇ョ敤鎴锋湭缁戝畾瑙掕壊");
- }
-
- //閫氳繃RoleID鑾峰彇MeunId鍒楄〃
- List<RoleMenuRelation> menuIdList = SpringContextHolder.getBean(RoleMenuRelationService.class)
- .list(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, one.getRoleId()));
-
- //鍒ょ┖
- if (menuIdList.isEmpty()) {
- return new ArrayList<>();
- }
- List<Long> menuIds = new ArrayList<>(menuIdList.size());
- for (RoleMenuRelation bean : menuIdList) {
- menuIds.add(bean.getMenuId());
- }
-
- resultList = SpringContextHolder.getBean(MenuService.class).getUserPermissionListById(menuIds);
-
+ //閫氳繃鐢ㄦ埛UserID鑾峰彇鐢ㄦ埛瑙掕壊
+ AdminRoleRelation one = SpringContextHolder.getBean(AdminRoleRelationService.class).
+ getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, SecurityUtils.getUserId()));
+ //鍒ょ┖
+ if (one == null) {
+ throw new BusinessException("璇ョ敤鎴锋湭缁戝畾瑙掕壊");
}
+ //閫氳繃RoleID鑾峰彇MeunId鍒楄〃
+ List<RoleMenuRelation> menuIdList = SpringContextHolder.getBean(RoleMenuRelationService.class)
+ .list(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, one.getRoleId()));
+
+ //鍒ょ┖
+ if (menuIdList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ List<Long> menuIds = new ArrayList<>(menuIdList.size());
+ for (RoleMenuRelation bean : menuIdList) {
+ menuIds.add(bean.getMenuId());
+ }
+
+ resultList = SpringContextHolder.getBean(MenuService.class).getUserPermissionListById(menuIds);
+
return resultList;
}
+
+
+ /**
+ * 鐢熸垚key
+ *
+ * @param userId
+ * @return
+ */
+ public String creatUserKey(Long userId, Integer type) {
+ if (userId == null) {
+ throw new BusinessException("鐢ㄦ埛ID涓嶈兘涓虹┖锛�");
+ }
+ //0锛氬厖閲嶇疆key,1锛氳幏鍙杒ey
+ if (type == null || (type != 0 && type != 1)) {
+ type = 1;
+ }
+
+ ClientService clientService = SpringContextHolder.getBean(ClientService.class);
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
+ if (client == null) {
+ throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦紝璇烽噸鏂扮‘璁わ紒");
+ }
+
+ //鑾峰彇
+ if (type == 1) {
+ return "鐢ㄦ埛鐨勪究鎹风櫥褰昸ey涓猴細" + client.getUserKey();
+ } else {
+ //鏇存柊
+ String md5 = MD5Util.md5("uesrId:" + userId + "_AdministratorType:" + 2 + "time:" + System.currentTimeMillis());
+ client.setUserKey(md5);
+ boolean flag = clientService.updateById(client);
+ if (flag) {
+ return "鐢熸垚渚挎嵎鐧诲綍key鎴愬姛锛岃鐢ㄦ埛key涓猴細" + md5 + "锛岃濡ュ杽淇濈锛�";
+ } else {
+ throw new BusinessException("鐢熸垚渚挎嵎鐧诲綍key澶辫触锛�");
+ }
+ }
+ }
}
--
Gitblit v1.9.3