From 109af646c863e5c6a2ac2fa5eefdffa9fe86d252 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 20 四月 2022 14:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 98 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 33 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 42c4ce9..296b992 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
@@ -1,15 +1,13 @@
package com.sandu.ximon.admin.controller;
-import cn.hutool.core.bean.BeanUtil;
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.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -18,17 +16,20 @@
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.AdminDto;
-import com.sandu.ximon.admin.dto.ClientDto;
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.*;
+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;
@@ -57,6 +58,7 @@
private final RoleService roleService;
private final TokenProvider tokenProvider;
private final AdminRoleRelationService adminRoleRelationService;
+ private PermissionConfig permissionConfig;
@Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@@ -116,7 +118,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)) {
@@ -125,38 +135,57 @@
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());
+ }
+
+ 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) {
- 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);
- });
+ if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<Admin> list = adminService.list(wrapper);
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
- 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);
+// 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("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@@ -223,14 +252,17 @@
@Log("鐢ㄦ埛淇敼澶村儚")
@PostMapping("/updateIcon")
- public ResponseVO<Object> updateIcon(@RequestBody String IconUrl) {
+ 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(), IconUrl);
- }else{
+ result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ } else {
//瓒呯骇绠＄悊鍛樸�佺鐞嗗憳淇敼澶村儚
- result= adminService.updateIcon(SecurityUtils.getUserId(), IconUrl);
+ result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
}
if (result) {
--
Gitblit v1.9.3