From a98228c5e829bff75969b51a37652d7dbd6bee7e Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期二, 18 一月 2022 16:24:41 +0800
Subject: [PATCH] 权限管理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 99 ++++++++++++++++++++++---------------------------
1 files changed, 45 insertions(+), 54 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 808f3a1..0d1ce6e 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
@@ -17,8 +17,9 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.dto.AdminJwtUser;
import com.sandu.ximon.admin.param.AdminLoginParam;
+import com.sandu.ximon.admin.param.AdminParam;
+import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.AdminService;
import com.sandu.ximon.admin.service.MenuService;
@@ -30,8 +31,8 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -39,9 +40,9 @@
import java.util.stream.Collectors;
/**
- * @author hupeng
- * @date 2018-11-23
- * 鎺堟潈銆佹牴鎹畉oken鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
+ * @author chenjiantian
+ * @date 2022/1/18 16:04
+ * 绠＄悊鍛樻帶鍒剁被
*/
@Slf4j
@RestController
@@ -81,7 +82,7 @@
loginUserInfo.setIp(IpUtil.getRealIp());
loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
-
+
// 鐢熸垚浠ょ墝
String token = tokenProvider.createToken(loginUserInfo);
@@ -104,7 +105,7 @@
Long userId = SecurityUtils.getUserId();
Admin admin = adminService.getById(userId);
List<Role> roles = roleService.listByAdminId(admin.getId());
- if(CollectionUtil.isEmpty(roles)){
+ if (CollectionUtil.isEmpty(roles)) {
return ResponseUtil.fail("鐢ㄦ埛娌℃湁瑙掕壊锛屾棤娉曡幏鍙栨暟鎹�");
}
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
@@ -130,33 +131,45 @@
return ResponseUtil.successPage(list);
}
-// @PreAuthorize("@el.check('admin:add')")
-// @PostMapping("/register")
-// public ResponseVO<Object> register(@Validated @RequestBody AdminParam adminParam) {
-// Admin admin = adminService.register(adminParam);
-// return ResponseUtil.success(admin);
-// }
+ @PostMapping("/register")
+ public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
+ boolean result = adminService.register(param);
+ if (result) {
+ return ResponseUtil.success("娉ㄥ唽鐢ㄦ埛鎴愬姛");
+ } else {
+ return ResponseUtil.fail("娉ㄥ唽鐢ㄦ埛澶辫触");
+ }
+ }
-// /**
-// * 淇敼绠＄悊鍛樹俊鎭�
-// *
-// * @param resources
-// * @return
-// */
-// @PutMapping("/{id}")
// @PreAuthorize("@el.check('admin:edit')")
-// public ResponseVO<Object> update(@RequestBody AdminParam resources, @PathVariable Long id) {
-// checkLevel(id);
-// adminService.updateAdmin(id, resources);
-// return ResponseUtil.success(null);
-// }
-//
-// @PutMapping("/updatePassword")
-// public ResponseVO<Object> updatePassword(@Validated @RequestBody PwdParam param) {
-// Long userId = SecurityUtils.getUserId();
-// adminService.updatePassword(userId, param);
-// return ResponseUtil.success(null);
-// }
+ /**
+ * 淇敼绠＄悊鍛樹俊鎭�
+ *
+ */
+ @PostMapping("/update/{adminId}")
+ public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
+ boolean result = adminService.updateAdmin(adminId, param);
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
+
+ /**
+ * 淇敼鎴戠殑瀵嗙爜
+ * @param param
+ * @return
+ */
+ @PutMapping("/updateMyPassword")
+ public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
+ boolean result = adminService.updateMyPassword(param);
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
// @PutMapping("/updateStatus/{id}")
// public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
@@ -190,28 +203,6 @@
// return ResponseUtil.success("");
// }
- /**
- * 濡傛灉褰撳墠鐢ㄦ埛鐨勮鑹茬骇鍒綆浜庡垱寤虹敤鎴风殑瑙掕壊绾у埆锛屽垯鎶涘嚭鏉冮檺涓嶈冻鐨勯敊璇�
- *
- * @param updateId 琚搷浣滀汉鐨刬d
- */
- private void checkLevel(Long updateId) {
- Admin admin = adminService.findByUserName(SecurityUtils.getUsername());
- // 鑾峰彇鎿嶄綔鑰呮渶澶ф潈闄�
- Integer currentLevel = Collections.min(roleService.listByAdminId(admin.getId()).stream().map(Role::getLevel).collect(Collectors.toList()));
- // 鑾峰彇琚紪杈戜汉鐨勬渶澶ф潈闄�
- List<Integer> optList = roleService.listByAdminId(updateId).stream().map(Role::getLevel).collect(Collectors.toList());
- // 娌℃潈闄� 闅忎究鎿嶄綔
- if (CollectionUtil.isEmpty(optList)) {
- return;
- }
- Integer optLevel = Collections.min(optList);
- if (optLevel != null) {
- if (currentLevel > optLevel) {
- throw new BusinessException("鏉冮檺涓嶈冻锛屼綘鐨勮鑹茬骇鍒細" + currentLevel + "锛屼綆浜庢搷浣滅殑瑙掕壊绾у埆锛�" + optLevel);
- }
- }
- }
// /**
// * 缂栬緫鎴戠殑淇℃伅
--
Gitblit v1.9.3