From 18a22cca92a642498a5bff274d00763813e9ee97 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 22 四月 2022 15:40:30 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 156 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 124 insertions(+), 32 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 2c3b135..1f23eab 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
@@ -3,13 +3,16 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.enums.RoleLevelStatus;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.redis.RedisService;
+import com.sandu.common.redis.UserModel;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.security.config.SecurityProperties;
@@ -19,28 +22,24 @@
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.param.ReceiveParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
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.admin.service.*;
+import com.sandu.ximon.dao.bo.MenuNode;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
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.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -61,8 +60,11 @@
private final ClientService clientService;
private final RoleService roleService;
private final TokenProvider tokenProvider;
+ private final AdminRoleRelationService adminRoleRelationService;
+ private PermissionConfig permissionConfig;
+ private final RedisService redisService;
-
+ @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@PostMapping(value = "/login")
public ResponseVO<Object> login(@RequestBody AdminLoginParam loginParam) {
@@ -85,7 +87,16 @@
loginUserInfo.setAccount(admin.getUsername());
loginUserInfo.setStatus(admin.getStatus());
loginUserInfo.setIp(IpUtil.getRealIp());
- loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
+
+ //纭畾鐢ㄦ埛瑙掕壊鏉冮檺
+ AdminRoleRelation adminRoleRelation = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, loginUserInfo.getUserId()));
+ Role role = roleService.getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, adminRoleRelation.getRoleId()));
+ if (role != null && role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
+ } else {
+ loginUserInfo.setAdministratorType(AdministratorEnums.CUSTOMER.getCode());
+ }
+
loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
// 鐢熸垚浠ょ墝
@@ -105,13 +116,15 @@
return ResponseUtil.success(authInfo);
}
+ // @Log("鍚庡彴鐢ㄦ埛淇℃伅")
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
+ System.out.println(SecurityUtils.getUserDetails().getAdministratorType() + " ---------");
Long userId = SecurityUtils.getUserId();
List<Role> roles;
MapBuilder<Object, Object> builder;
- if (AdministratorEnums.ADMIN.equals(SecurityUtils.getAdministratorIdentity())
- || AdministratorEnums.CUSTOMER.equals(SecurityUtils.getAdministratorIdentity())) {
+ if (AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getAdministratorIdentity())
+ || AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
Admin admin = adminService.getById(userId);
roles = roleService.listByAdminId(admin.getId());
builder = MapUtil.builder().put("admin", admin);
@@ -119,7 +132,15 @@
} else {
Client client = clientService.getById(userId);
roles = roleService.listByClientId(client.getId());
- builder = MapUtil.builder().put("admin", client);
+ //涓轰簡淇濇寔杩斿洖鏁版嵁鏍煎紡涓�鑷�
+ Admin admin = new Admin();
+ admin.setId(client.getId());
+ admin.setIcon(client.getIcon());
+ admin.setNickName(client.getLinkMan());
+ admin.setMobile(client.getMobile());
+ admin.setLoginTime(client.getLoginTime());
+ admin.setCreateTime(client.getCreateTime());
+ builder = MapUtil.builder().put("admin", admin);
}
if (CollectionUtil.isEmpty(roles)) {
@@ -128,25 +149,71 @@
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
if (CollectionUtil.isNotEmpty(menus)) {
List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
- builder.put("menus", collect);
+
+ List<MenuNode> menuNodeList = collect.stream()
+ .filter(menu -> menu.getPid().equals(0L))
+ .map(menu -> covertMenuNode(menu, collect)).collect(Collectors.toList());
+ builder.put("menus", menuNodeList);
}
return ResponseUtil.success(builder.build());
}
- @GetMapping(value = "/list")
- public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String 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);
- return ResponseUtil.successPage(list);
+ @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("閫�鍑虹櫥褰曟垚鍔�");
}
+ private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
+ MenuNode node = new MenuNode();
+ BeanUtils.copyProperties(menu, node);
+ List<MenuNode> children = menuList.stream()
+ .filter(subMenu -> subMenu.getPid().equals(menu.getId()))
+ .map(subMenu -> covertMenuNode(subMenu, menuList)).collect(Collectors.toList());
+ node.setChildren(children);
+ return node;
+ }
+
+ @Log("鍚庡彴鐢ㄦ埛鍒楄〃")
+ @GetMapping(value = "/list")
+ public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
+ 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("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
boolean result = adminService.register(param);
@@ -162,6 +229,7 @@
/**
* 淇敼绠＄悊鍛樹俊鎭�
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼淇℃伅")
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
boolean result = adminService.updateAdmin(adminId, param);
@@ -175,6 +243,7 @@
/**
* 淇敼鎴戠殑瀵嗙爜
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
boolean result = adminService.updateMyPassword(param);
@@ -195,6 +264,7 @@
// return ResponseUtil.success(null);
// }
+ @Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
boolean result = adminService.deleteAdmin(adminId);
@@ -205,6 +275,28 @@
}
}
+ @Log("鐢ㄦ埛淇敼澶村儚")
+ @PostMapping("/updateIcon")
+ public ResponseVO<Object> updateIcon(@RequestBody ReceiveParam receiveParam) {
+ if (receiveParam.getIconUrl().trim() == null) {
+ throw new BusinessException("澶村儚URL涓嶈兘涓虹┖锛�");
+ }
+ boolean result;
+ //鏅�氱敤鎴蜂慨鏀瑰ご鍍�
+ if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.NORMAL.getCode())) {
+ result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ } else {
+ //瓒呯骇绠＄悊鍛樸�佺鐞嗗憳淇敼澶村儚
+ result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ }
+
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
+
// /**
// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
// *
--
Gitblit v1.9.3