From b331b3eb2d1c2f0cba7b764678d8bbf672c6fe45 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Mon, 07 Sep 2020 15:06:31 +0800
Subject: [PATCH] 修改 Python加密密码 的接受参数的为RequestParam
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
index 8ae640b..fb113aa 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
@@ -15,7 +15,6 @@
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -41,7 +40,7 @@
@Autowired
private ISysMenuService menuService;
- /**
+ /**current
* 两层循环实现建树
*
* @param sysMenus
@@ -64,9 +63,6 @@
}
return menus;
}
-
-
-
/**
* 修改菜单状态
@@ -117,9 +113,9 @@
for (SysMenu sysMenu : allMenus) {
Map<String, Object> authTree = new HashMap<>();
- authTree.put("id", sysMenu.getId());
+ authTree.put("id", sysMenu.getId().toString());
authTree.put("name", sysMenu.getName());
- authTree.put("pId", sysMenu.getParentId());
+ authTree.put("pId", sysMenu.getParentId().toString());
authTree.put("open", true);
authTree.put("checked", false);
if (roleMenusMap.get(sysMenu.getId()) != null) {
@@ -132,7 +128,7 @@
@ApiOperation(value = "根据roleCodes获取对应的权限")
@SuppressWarnings("unchecked")
- @Cacheable(value = "menu", key ="#roleCodes")
+// @Cacheable(value = "menu", key ="#roleCodes")
@GetMapping("/{roleCodes}")
public List<SysMenu> findMenuByRoles(@PathVariable String roleCodes) {
List<SysMenu> result = null;
@@ -202,7 +198,8 @@
if (CollectionUtil.isEmpty(roles)) {
return ResultBody.ok().data(Collections.emptyList());
}
- List<SysMenu> menus = menuService.findByRoleCodes(roles.parallelStream().map(SysRole::getCode).collect(Collectors.toSet()), CommonConstant.MENU);
+ Set<String> collect = roles.stream().map(e -> e.getCode()).collect(Collectors.toSet());
+ List<SysMenu> menus = menuService.findByRoleCodes(collect, CommonConstant.MENU);
return ResultBody.ok().data(treeBuilder(menus));
}
}
--
Gitblit v1.8.0