From 9066298c5da93b8a9bff47cd8f73d9ff2cca15b5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 13 五月 2022 14:10:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 86 +++++++-----------------------------------
1 files changed, 15 insertions(+), 71 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 2ffec97..f624373 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -168,10 +168,6 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
-// redisService.set(UserModel.USER_INFO.key(SecurityUtils.getUserId().toString() + SecurityUtils.getUserDetails().getAdministratorType()), null);
-// redisService.set(UserModel.USER_TOKEN.key(UserModel.USER_TOKEN.key(SecurityUtils.getUserDetails().getToken())), null);
-
-
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
@@ -194,31 +190,6 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
-
-// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-// LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
-// if (keyword != null) {
-// wrapper.like(Admin::getNickName, keyword)
-// .or(adminLambdaQueryWrapper -> {
-// adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
-// });
-// }
-// List<Admin> list = adminService.list(wrapper);
-//
-// List<AdminDto> adminDtoList = new ArrayList<>();
-// for (Admin demo : list) {
-// AdminDto adminDto = new AdminDto();
-// BeanUtil.copyProperties(demo, adminDto);
-// AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
-// .eq(AdminRoleRelation::getAdminId, demo.getId()));
-//
-// if (one != null) {
-// adminDto.setRoleId(one.getRoleId());
-// }
-// adminDtoList.add(adminDto);
-//
-// }
-// return ResponseUtil.successPage(adminDtoList);
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@@ -235,7 +206,6 @@
}
}
-// @PreAuthorize("@el.check('admin:edit')")
/**
* 淇敼绠＄悊鍛樹俊鎭�
@@ -293,16 +263,6 @@
}
}
-// @PutMapping("/updateStatus/{id}")
-// public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
-// checkLevel(id);
-// Admin update = new Admin();
-// update.setId(id);
-// update.setStatus(status);
-// adminService.updateById(update);
-// return ResponseUtil.success(null);
-// }
-
@Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
@@ -339,37 +299,21 @@
}
}
-// /**
-// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
-// *
-// * @return
-// */
-// @PostMapping("/updateAdminRole")
-// @PreAuthorize("@el.check('admin:edit')")
-// public ResponseVO<Object> updateAdminRole(@RequestParam("adminId") Long adminId,
-// @RequestParam("roleIds") List<Long> roleIds) {
-// checkLevel(adminId);
-// adminsRolesService.updateAdminRole(adminId, roleIds);
-// return ResponseUtil.success("");
-// }
+ /**
+ * 鑾峰彇鐢ㄦ埛鏉冮檺
+ *
+ * @return
+ */
+ @GetMapping("/getUserPermissionList")
+ public ResponseVO<Object> getUserPermissionList() {
+ List<MenuNode> userPermissionList;
+ if (SecurityUtils.getClientId() == null) {
+ userPermissionList = adminService.getUserPermissionList();
+ } else {
+ userPermissionList = clientService.getUserPermissionList();
+ }
-// /**
-// * 缂栬緫鎴戠殑淇℃伅
-// *
-// * @param resources
-// * @return
-// */
-// @PutMapping("/editUserInfo")
-// public ResponseVO<Object> editUserInfo(@RequestBody AdminParam resources) {
-// Long userId = SecurityUtils.getUserId();
-// Admin admin = new Admin();
-// admin.setId(userId);
-// admin.setMobile(resources.getMobile());
-// admin.setEmail(resources.getEmail());
-// admin.setNickName(resources.getNickName());
-// adminService.updateById(admin);
-// return ResponseUtil.success(null);
-// }
-
+ return ResponseUtil.success(userPermissionList);
+ }
}
--
Gitblit v1.9.3