From 9b5aa00b8ea99a0a7c790388e3f8662c9a70de61 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sat, 25 Aug 2018 22:37:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/HomeController.java | 47 +++++++++++++------ .../controller/MallUserInfoController.java | 10 ++-- .../com/simple/domain/po/MallUserInfo.java | 10 ++++ 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index d0f406ae5..121052a49 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -1,12 +1,8 @@ package com.simple.controller; -import java.util.List; -import java.util.stream.Collectors; - import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; -import org.omg.CORBA.SystemException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -14,14 +10,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.simple.common.ErrorCode; -import com.simple.common.Result; +import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; -import com.simple.domain.po.MallPermission; -import com.simple.domain.po.MallRole; +import com.simple.domain.po.MallRolePermission; import com.simple.domain.po.MallUserInfo; -import com.simple.service.MallPermissionService; -import com.simple.service.MallRoleService; +import com.simple.domain.po.MallUserRole; +import com.simple.service.MallRolePermissionService; +import com.simple.service.MallUserRoleService; import com.simple.shiro.UserSession; import io.swagger.annotations.Api; @@ -32,11 +27,17 @@ import io.swagger.annotations.ApiOperation; @Api(description="登录相关接口") public class HomeController { +// @Autowired +// private MallRoleService sysRoleService; +// +// @Autowired +// private MallPermissionService sysPermissionService; + @Autowired - private MallRoleService sysRoleService; - + private MallUserRoleService mallUserRoleService; + @Autowired - private MallPermissionService sysPermissionService; + private MallRolePermissionService mallRolePermissionService; // @GetMapping("login") // public ResultData login() { @@ -64,7 +65,25 @@ public class HomeController { // } MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); - System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); +// System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); + MallUserRole ur = new MallUserRole(); + ur.setUid(info.getId()); + PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); + if(page.getSize()>0) { + Long roleId = page.getList().get(0).getRoleId(); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(p.getRoleId()); + p.setTenantId(info.getTenantId()); + PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); + String menus = ""; + for(MallRolePermission rp :listAsPage.getList()) { + menus+=rp.getPermissionId()+","; + } + if(menus.length()>0) { + menus = menus.substring(0, menus.length()-1); + } + info.setMenus(menus); + } data.data=info; }catch(Exception e) { return new ResultData(ResultData.ERROR,"用户名或者密码错误"); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 21ca8197d..c8d354e52 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -1,14 +1,8 @@ package com.simple.controller; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import com.simple.domain.po.MallUserInfo; -import com.simple.domain.po.MallUserRole; -import com.simple.service.MallUserInfoService; -import com.simple.service.MallUserRoleService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -20,6 +14,10 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; +import com.simple.domain.po.MallUserInfo; +import com.simple.domain.po.MallUserRole; +import com.simple.service.MallUserInfoService; +import com.simple.service.MallUserRoleService; import com.simple.shiro.PasswordHelper; import com.simple.shiro.UserSession; diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 318ea159c..3c6a4665b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -73,7 +73,17 @@ public class MallUserInfo implements Serializable { //该用户包含的所有权限 @Transient private List permission; + //拥有的菜单权限 + private String menus; + public String getMenus() { + return menus; + } + + public void setMenus(String menus) { + this.menus = menus; + } + public Long getRoleId() { return roleId; }