From 8cbf25a4bb94a90e8864618c3b6a84363708751e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 2 Sep 2018 14:10:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E4=BF=AE=E5=A4=8D]:permis?= =?UTF-8?q?son=E5=8E=BB=E6=8E=89tenant=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MallPermissionController.java | 1 - .../simple/controller/MallRoleController.java | 8 +- .../controller/MallUserInfoController.java | 81 +++++++++++-------- .../com/simple/domain/po/MallPermission.java | 12 --- .../resources/mapper/MallPermissionMapper.xml | 10 +-- 5 files changed, 53 insertions(+), 59 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java index f0ac7ce96..858e0c21a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java @@ -12,7 +12,6 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.MallPermission; import com.simple.service.MallPermissionService; -import com.simple.service.MallRolePermissionService; /** * @author chenkx diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index e1c2e3016..6cf72708e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -27,17 +27,15 @@ import io.swagger.annotations.Api; @RestController @RequestMapping("role") @Api(description="角色相关接口") -public class MallRoleController extends BaseController{ +public class MallRoleController extends BaseController { + + private Logger logger = Logger.getLogger(MallRoleController.class); @Autowired private MallRoleService sysRoleService; @Autowired private MallRolePermissionService sysRolePermissionService; - - - - private Logger logger = Logger.getLogger(MallRoleController.class); @GetMapping("list") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 219383f82..f330dbccc 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -3,6 +3,8 @@ package com.simple.controller; import java.util.HashMap; import java.util.Map; +import com.simple.domain.po.*; +import com.simple.service.*; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -14,14 +16,6 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; -import com.simple.domain.po.MallRole; -import com.simple.domain.po.MallRolePermission; -import com.simple.domain.po.MallUserInfo; -import com.simple.domain.po.MallUserRole; -import com.simple.service.MallRolePermissionService; -import com.simple.service.MallRoleService; -import com.simple.service.MallUserInfoService; -import com.simple.service.MallUserRoleService; import com.simple.shiro.PasswordHelper; import com.simple.shiro.UserSession; @@ -35,7 +29,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "API - UserInfoController", description = "用户接口") @RestController @RequestMapping("user") -public class MallUserInfoController { +public class MallUserInfoController extends BaseController { @Autowired MallUserInfoService userInfoService; @@ -48,12 +42,17 @@ public class MallUserInfoController { @Autowired MallUserRoleService mallUserRoleService; + + @Autowired + MallPermissionService mallPermissionService; + @Autowired MallRolePermissionService mallRolePermissionService; @ApiOperation(value = "用户分页接口", response = String.class) @GetMapping("lists") public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize){ + userInfo.setTenantId(getTenantId()); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for(MallUserInfo u:page.getList()) { MallUserRole r =new MallUserRole(); @@ -61,8 +60,10 @@ public class MallUserInfoController { PageInfo ur = userRoleService.listAsPage(r, 1, 1); if(ur.getSize()>0) { MallRole role = mallRoleService.getById(ur.getList().get(0).getRoleId()); - u.setRoleName(role.getName()); - u.setRoleId(role.getId()); + if (role != null) { + u.setRoleName(role.getName()); + u.setRoleId(role.getId()); + } } u.setPassword(null);//不返回密码 } @@ -84,6 +85,7 @@ public class MallUserInfoController { Assert.notNull(userInfo.getPassword(), "密码不能为空"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); + userInfo.setTenantId(getTenantId()); userInfoService.saveOrUpdate(userInfo); if(userInfo.getRoleId()!=null) { MallUserRole r = new MallUserRole(); @@ -103,6 +105,7 @@ public class MallUserInfoController { // PasswordHelper passwordHelper = new PasswordHelper(); // passwordHelper.encryptPassword(userInfo); userInfo.setPassword(null); + userInfo.setTenantId(getTenantId()); userInfoService.saveOrUpdate(userInfo); if(userInfo.getRoleId()!=null) { userRoleService.deleteByUserId(userInfo.getId()); @@ -133,6 +136,7 @@ public class MallUserInfoController { public ResultData modifyStatus(Long userId, Integer status) { MallUserInfo userInfo = userInfoService.getById(userId); userInfo.setStatus(status); + userInfo.setTenantId(getTenantId()); userInfoService.saveOrUpdate(userInfo); return new ResultData(userInfo); } @@ -190,27 +194,38 @@ public class MallUserInfoController { public ResultData getUserInfo(){ MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); -// 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(roleId); - 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); - } - ResultData data = new ResultData(); - data.data=info; - return data; + if (info.getIsAdmin() == 1) { // isAdmin + MallPermission q = new MallPermission(); + PageInfo list = mallPermissionService.listAsPage(q,1,100); + String menus = ""; + for(MallPermission rp :list.getList()) { + menus+=rp.getId()+","; + } + if(menus.length()>0) { + menus = menus.substring(0, menus.length()-1); + } + info.setMenus(menus); + } else { + // 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(roleId); + 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); + } + } + return new ResultData(info); } } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java b/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java index d803518b1..de48a9d35 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java @@ -40,11 +40,6 @@ public class MallPermission implements Serializable { this.ids = ids; } - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; /*权限名称[LIKE]**/ @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="name") private String name; @@ -85,12 +80,6 @@ public class MallPermission implements Serializable { private Integer sortLte; @Transient private Integer sortLt; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } public String getName() { return name; } @@ -193,7 +182,6 @@ public class MallPermission implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") ,ParentId_ASC("`parentId` ASC"),ParentId_DESC("`parentId` DESC") diff --git a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index f6cdddd38..21d09e52d 100644 --- a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -3,7 +3,6 @@ - @@ -15,7 +14,7 @@ - `id`,`tenant_id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` + `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` @@ -25,12 +24,7 @@ and `id` = #{id} - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - + and `name` like concat('%', #{name},'%')