From 67b483b124d74ba1ef5701b508d4e808e26b0d2e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 11 三月 2022 15:13:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 147 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 69 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 d076174..2c3b135 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
@@ -7,8 +7,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
-import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -16,33 +16,37 @@
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.ClientService;
import com.sandu.ximon.admin.service.MenuService;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.Menu;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Collections;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
- * @author hupeng
- * @date 2018-11-23
- * 鎺堟潈銆佹牴鎹畉oken鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
+ * @author chenjiantian
+ * @date 2022/1/18 16:04
+ * 绠＄悊鍛樻帶鍒剁被
*/
@Slf4j
@RestController
@@ -54,6 +58,7 @@
private final MenuService menuService;
private final PasswordEncoder passwordEncoder;
private final AdminService adminService;
+ private final ClientService clientService;
private final RoleService roleService;
private final TokenProvider tokenProvider;
@@ -68,10 +73,11 @@
if (!passwordEncoder.matches(loginParam.getPassword(), admin.getPassword())) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
- UserDetails userJwtUser = new AdminJwtUser(admin, roleService.mapToGrantedAuthorities(admin.getId()));
- if (!userJwtUser.isEnabled()) {
+ if (AdminStatusStatus.DISABLE.getCode().equals(admin.getStatus())) {
return ResponseUtil.error(ResponseStatusEnums.DISABLE_ACCOUNT.getCode(), ResponseStatusEnums.DISABLE_ACCOUNT.getMessage());
}
+
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId(), true);
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(admin.getId());
@@ -80,8 +86,7 @@
loginUserInfo.setStatus(admin.getStatus());
loginUserInfo.setIp(IpUtil.getRealIp());
loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
- loginUserInfo.setPermission("tenant");
-
+ loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
// 鐢熸垚浠ょ墝
String token = tokenProvider.createToken(loginUserInfo);
@@ -103,12 +108,26 @@
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
Long userId = SecurityUtils.getUserId();
- Admin admin = adminService.getById(userId);
- List<Role> roles = roleService.listByAdminId(admin.getId());
+ List<Role> roles;
+ MapBuilder<Object, Object> builder;
+ if (AdministratorEnums.ADMIN.equals(SecurityUtils.getAdministratorIdentity())
+ || AdministratorEnums.CUSTOMER.equals(SecurityUtils.getAdministratorIdentity())) {
+ Admin admin = adminService.getById(userId);
+ roles = roleService.listByAdminId(admin.getId());
+ builder = MapUtil.builder().put("admin", admin);
+
+ } else {
+ Client client = clientService.getById(userId);
+ roles = roleService.listByClientId(client.getId());
+ builder = MapUtil.builder().put("admin", client);
+
+ }
+ if (CollectionUtil.isEmpty(roles)) {
+ return ResponseUtil.fail("鐢ㄦ埛娌℃湁瑙掕壊锛屾棤娉曡幏鍙栨暟鎹�");
+ }
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
- MapBuilder<Object, Object> builder = MapUtil.builder().put("info", admin);
if (CollectionUtil.isNotEmpty(menus)) {
- List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0).collect(Collectors.toList());
+ List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
builder.put("menus", collect);
}
return ResponseUtil.success(builder.build());
@@ -128,33 +147,43 @@
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("淇敼澶辫触");
+ }
+ }
+
+ /**
+ * 淇敼鎴戠殑瀵嗙爜
+ */
+ @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) {
@@ -166,13 +195,15 @@
// return ResponseUtil.success(null);
// }
-// @DeleteMapping("/{id}")
-// @PreAuthorize("@el.check('admin:del')")
-// public ResponseVO<Object> delete(@PathVariable Long id) {
-// checkLevel(id);
-// adminService.deleteAdmin(id);
-// return ResponseUtil.success(null);
-// }
+ @PostMapping("/del/{adminId}")
+ public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
+ boolean result = adminService.deleteAdmin(adminId);
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
// /**
// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
@@ -188,28 +219,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