From f86fd019e49a4331c18bd5d736096af09f2a73ad Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 18 四月 2022 15:09:47 +0800
Subject: [PATCH] 节目/文件归属问题
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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..cf3af06 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
@@ -10,6 +10,7 @@
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;
@@ -23,12 +24,17 @@
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 +63,7 @@
private final RoleService roleService;
private final TokenProvider tokenProvider;
private final AdminRoleRelationService adminRoleRelationService;
+ private PermissionConfig permissionConfig;
@Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@@ -125,14 +132,31 @@
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) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
if (keyword != null) {
@@ -223,14 +247,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