From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 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 4374972..7213ec2 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
@@ -173,7 +173,7 @@
if (admin == null) {
throw new BusinessException("鎵句笉鍒扮鐞嗗憳");
}
- if(!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())){
+ if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
throw new BusinessException("鍙湁瓒呯骇绠＄悊鍛樻墠鑳藉垹闄ょ敤鎴�");
}
@@ -182,6 +182,9 @@
//鏈夌敤鎴峰繀瀹氭湁鐢ㄦ埛涓庤鑹茬殑鍏崇郴鏁版嵁
AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, admin.getId()));
Role role = SpringContextHolder.getBean(RoleService.class).getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, one.getRoleId()));
+ if (role == null) {
+ throw new BusinessException("鏁版嵁寮傚父锛�");
+ }
if (role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
throw new BusinessException("瓒呯骇绠＄悊鍛樻棤娉曞垹闄�");
@@ -196,6 +199,15 @@
}
}
}
+
+ /**
+ * 鍒犻櫎绠＄悊鍛� 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鍒犻櫎绠＄悊鍛橈細" + admin.getUsername() + "鐢ㄦ埛id锛�" + admin;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎绠＄悊鍛�", content);
+ /**
+ * 鍒犻櫎绠＄悊鍛� 鏃ュ織璁板綍缁撴潫
+ */
return flag;
}
@@ -262,36 +274,29 @@
*/
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;
}
}
--
Gitblit v1.9.3