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/param/AdminParam.java | 26 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 99 +++++++++----------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 18 ++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 94 ++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/param/PwdParam.java | 23 ++++
sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java | 29 +++++
6 files changed, 229 insertions(+), 60 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java b/sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java
new file mode 100644
index 0000000..63a827a
--- /dev/null
+++ b/sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java
@@ -0,0 +1,29 @@
+package com.sandu.common.enums;
+
+/**
+ * @author chenjiantian
+ */
+public enum RoleLevelStatus {
+ /**
+ *
+ */
+ SUPER(1, "瓒呯骇绠＄悊鍛�"),
+ COMMON(2, "鏅�氱鐞嗗憳"),
+ ;
+
+ private final Integer code;
+ private final String message;
+
+ RoleLevelStatus(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
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);
- }
- }
- }
// /**
// * 缂栬緫鎴戠殑淇℃伅
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdminParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdminParam.java
new file mode 100644
index 0000000..f588b5e
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdminParam.java
@@ -0,0 +1,26 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author chenjiantian
+ * @date 2022/1/18 15:56
+ */
+@Data
+public class AdminParam {
+ @NotBlank(message = "璐﹀彿涓嶈兘涓虹┖")
+ private String username;
+
+ @NotBlank(message = "瀵嗙爜涓嶈兘涓虹┖")
+ private String password;
+ private String mobile;
+ @NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
+ private String nickName;
+ private String note;
+
+ @NotNull(message = "瑙掕壊id涓嶈兘涓虹┖")
+ private Long roleId;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PwdParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PwdParam.java
new file mode 100644
index 0000000..453ad5e
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PwdParam.java
@@ -0,0 +1,23 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * @author chenjiantian
+ * @date 2022/1/18 16:21
+ */
+@Data
+public class PwdParam {
+ @NotBlank(message = "鏃у瘑鐮佷笉鑳戒负绌�")
+ private String oldPass;
+ @NotBlank(message = "鏂板瘑鐮佷笉鑳戒负绌�")
+ @Size(min = 6,message = "瀵嗙爜鏈�鐭繀椤绘槸6浣�")
+ private String newPass;
+ @NotBlank(message = "纭瀵嗙爜涓嶈兘涓虹┖")
+ @Size(min = 6,message = "瀵嗙爜鏈�鐭繀椤绘槸6浣�")
+ private String confirmPass;
+}
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 8bc07bd..671ed5a 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,18 +1,112 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.common.enums.RoleLevelStatus;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+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.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.AdminRoleRelation;
+import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.mapper.AdminMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @author chenjiantian
* @date 2021/11/24 11:02
*/
@Service
+@AllArgsConstructor
public class AdminService extends BaseServiceImpl<AdminMapper, Admin> {
+
+ private final PasswordEncoder passwordEncoder;
+ private final AdminRoleRelationService adminRoleRelationService;
+ private final RoleService roleService;
+
public Admin findByUserName(String username) {
return getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, username).last("limit 1"));
}
+
+ @Transactional(rollbackFor = Exception.class)
+ public boolean register(AdminParam param) {
+ Admin admin = findByUserName(param.getUsername());
+ if (admin != null) {
+ throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡瀛樺湪");
+ }
+ Admin save = new Admin();
+ save.setUsername(param.getUsername());
+ save.setPassword(passwordEncoder.encode(param.getPassword()));
+ save.setNickName(param.getNickName());
+ save.setMobile(param.getMobile());
+ save.setNote(param.getNote());
+ if (!save(save)) {
+ throw new BusinessException("娉ㄥ唽绠＄悊鍛樺け璐�");
+ }
+
+ Role role = roleService.getById(param.getRoleId());
+ if (role == null) {
+ throw new BusinessException("瑙掕壊涓嶅瓨鍦�");
+ }
+ if (RoleLevelStatus.SUPER.getCode().equals(role.getLevel())) {
+ throw new BusinessException("鏃犳硶娣诲姞瓒呯骇绠＄悊鍛�");
+ }
+
+ AdminRoleRelation adminRoleRelation = new AdminRoleRelation();
+ adminRoleRelation.setAdminId(save.getId());
+ adminRoleRelation.setRoleId(param.getRoleId());
+ if (!adminRoleRelationService.save(adminRoleRelation)) {
+ throw new BusinessException("娣诲姞绠＄悊鍛樿鑹插け璐�");
+ }
+ return true;
+ }
+
+ public boolean updateAdmin(Long adminId, AdminParam param) {
+ Admin admin = getById(adminId);
+ if(admin == null){
+ throw new BusinessException("鎵句笉鍒扮鐞嗗憳");
+ }
+ List<Role> roles = roleService.listByAdminId(admin.getId());
+ if(CollectionUtil.isEmpty(roles)){
+ throw new BusinessException("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
+ }
+ List<Integer> levels = roles.stream().map(Role::getLevel).collect(Collectors.toList());
+ int min = Collections.min(levels);
+ roleService.assertLevels(min);
+ Admin update = new Admin();
+ update.setId(adminId);
+ update.setPassword(passwordEncoder.encode(param.getPassword()));
+ update.setNickName(param.getNickName());
+ update.setMobile(param.getMobile());
+ update.setNote(param.getNote());
+ return updateById(update);
+ }
+
+ public boolean updateMyPassword(PwdParam param) {
+ if(!StrUtil.equals(param.getNewPass(),param.getConfirmPass())){
+ throw new BusinessException("涓ゆ瀵嗙爜涓嶄竴鑷�");
+ }
+ Long userId = SecurityUtils.getUserId();
+ Admin admin = getById(userId);
+ if (admin == null) {
+ throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ if(!passwordEncoder.matches(param.getOldPass(),admin.getPassword())){
+ throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
+ }
+ Admin update = new Admin();
+ update.setId(userId);
+ update.setPassword(passwordEncoder.encode(param.getNewPass()));
+ return updateById(update);
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
index 04f943a..266d379 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.execption.EntityExistException;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -83,7 +84,7 @@
Role role = new Role();
role.setName(param.getName());
role.setRemark(param.getRemark());
- role.setLevel(2);
+ role.setLevel(RoleLevelStatus.COMMON.getCode());
if(!save(role)){
throw new BusinessException("娣诲姞瑙掕壊澶辫触");
}
@@ -101,6 +102,7 @@
}
assertLevels(role.getLevel());
Role update = new Role();
+ update.setId(roleId);
update.setName(param.getName());
update.setRemark(param.getRemark());
if(!updateById(update)){
@@ -113,8 +115,12 @@
}
-
- private int assertLevels(Integer level) {
+ /**
+ * 鍒ゆ柇褰撳墠瑙掕壊鑳戒笉鑳芥搷浣滅洰鏍囩敤鎴� 涓嶈鐨勮瘽鐩存帴鎶涘嚭寮傚父
+ * @param roleLevel 鐩爣鐢ㄦ埛鐨勬渶澶ц鑹�
+ * @return
+ */
+ public int assertLevels(Integer roleLevel) {
Long userId = SecurityUtils.getUserId();
List<Role> roles = listByAdminId(userId);
if(CollectionUtil.isEmpty(roles)){
@@ -122,9 +128,9 @@
}
List<Integer> levels = roles.stream().map(Role::getLevel).collect(Collectors.toList());
int min = Collections.min(levels);
- if (level != null) {
- if (level < min) {
- throw new BusinessException("鏉冮檺涓嶈冻锛屼綘鐨勮鑹茬骇鍒細" + min + "锛屼綆浜庢搷浣滅殑瑙掕壊绾у埆锛�" + level);
+ if (roleLevel != null) {
+ if (roleLevel < min) {
+ throw new BusinessException("鏉冮檺涓嶈冻锛屼綘鐨勮鑹茬骇鍒細" + min + "锛屼綆浜庢搷浣滅殑瑙掕壊绾у埆锛�" + roleLevel);
}
}
return min;
--
Gitblit v1.9.3