Преглед изворни кода

[菜单][修复]:permisson去掉tenant_id

release_toaliyun_real
Stormeye.Wu пре 7 година
родитељ
комит
8cbf25a4bb
5 измењених фајлова са 53 додато и 59 уклоњено
  1. +0
    -1
      mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java
  2. +3
    -5
      mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java
  3. +48
    -33
      mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java
  4. +0
    -12
      mallinkService/src/main/java/com/simple/domain/po/MallPermission.java
  5. +2
    -8
      mallinkService/src/main/resources/mapper/MallPermissionMapper.xml

+ 0
- 1
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


+ 3
- 5
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) {


+ 48
- 33
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<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize);
for(MallUserInfo u:page.getList()) {
MallUserRole r =new MallUserRole();
@@ -61,8 +60,10 @@ public class MallUserInfoController {
PageInfo<MallUserRole> 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<MallUserRole> 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<MallRolePermission> 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<MallPermission> 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<MallUserRole> 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<MallRolePermission> 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);
}
}

+ 0
- 12
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")


+ 2
- 8
mallinkService/src/main/resources/mapper/MallPermissionMapper.xml Прегледај датотеку

@@ -3,7 +3,6 @@
<mapper namespace="com.simple.mapper.MallPermissionMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.MallPermission">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="available" jdbcType="VARCHAR" property="available" />
<result column="parent_id" jdbcType="BIGINT" property="parentId" />
@@ -15,7 +14,7 @@
</resultMap>
<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">
@@ -25,12 +24,7 @@
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
</if>

<if test=" null != name ">
and `name` like concat('%', #{name},'%')


Loading…
Откажи
Сачувај