From f15bb0563c9a077f888d866b36f5d77ae3b66ac2 Mon Sep 17 00:00:00 2001 From: macro Date: Sat, 12 Sep 2020 16:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/controller/UmsAdminController.java | 20 ----- .../controller/UmsPermissionController.java | 73 ------------------- .../mall/controller/UmsRoleController.java | 20 ----- .../dao/UmsAdminPermissionRelationDao.java | 17 ----- .../mall/dao/UmsAdminRoleRelationDao.java | 11 --- .../dao/UmsRolePermissionRelationDao.java | 23 ------ .../com/macro/mall/dto/UmsPermissionNode.java | 19 ----- .../macro/mall/service/UmsAdminService.java | 12 --- .../mall/service/UmsPermissionService.java | 37 ---------- .../macro/mall/service/UmsRoleService.java | 12 --- .../service/impl/UmsAdminServiceImpl.java | 50 ------------- .../impl/UmsPermissionServiceImpl.java | 73 ------------------- .../mall/service/impl/UmsRoleServiceImpl.java | 29 -------- .../dao/UmsAdminPermissionRelationDao.xml | 13 ---- .../resources/dao/UmsAdminRoleRelationDao.xml | 38 ---------- .../dao/UmsRolePermissionRelationDao.xml | 21 ------ 16 files changed, 468 deletions(-) delete mode 100644 mall-admin/src/main/java/com/macro/mall/controller/UmsPermissionController.java delete mode 100644 mall-admin/src/main/java/com/macro/mall/dao/UmsAdminPermissionRelationDao.java delete mode 100644 mall-admin/src/main/java/com/macro/mall/dao/UmsRolePermissionRelationDao.java delete mode 100644 mall-admin/src/main/java/com/macro/mall/dto/UmsPermissionNode.java delete mode 100644 mall-admin/src/main/java/com/macro/mall/service/UmsPermissionService.java delete mode 100644 mall-admin/src/main/java/com/macro/mall/service/impl/UmsPermissionServiceImpl.java delete mode 100644 mall-admin/src/main/resources/dao/UmsAdminPermissionRelationDao.xml delete mode 100644 mall-admin/src/main/resources/dao/UmsRolePermissionRelationDao.xml diff --git a/mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java b/mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java index 02cd161..4f191a4 100644 --- a/mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java +++ b/mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java @@ -7,7 +7,6 @@ import com.macro.mall.dto.UmsAdminLoginParam; import com.macro.mall.dto.UmsAdminParam; import com.macro.mall.dto.UpdateAdminPasswordParam; import com.macro.mall.model.UmsAdmin; -import com.macro.mall.model.UmsPermission; import com.macro.mall.model.UmsRole; import com.macro.mall.service.UmsAdminService; import com.macro.mall.service.UmsRoleService; @@ -202,23 +201,4 @@ public class UmsAdminController { return CommonResult.success(roleList); } - @ApiOperation("给用户分配+-权限") - @RequestMapping(value = "/permission/update", method = RequestMethod.POST) - @ResponseBody - public CommonResult updatePermission(@RequestParam Long adminId, - @RequestParam("permissionIds") List permissionIds) { - int count = adminService.updatePermission(adminId, permissionIds); - if (count > 0) { - return CommonResult.success(count); - } - return CommonResult.failed(); - } - - @ApiOperation("获取用户所有权限（包括+-权限）") - @RequestMapping(value = "/permission/{adminId}", method = RequestMethod.GET) - @ResponseBody - public CommonResult> getPermissionList(@PathVariable Long adminId) { - List permissionList = adminService.getPermissionList(adminId); - return CommonResult.success(permissionList); - } } diff --git a/mall-admin/src/main/java/com/macro/mall/controller/UmsPermissionController.java b/mall-admin/src/main/java/com/macro/mall/controller/UmsPermissionController.java deleted file mode 100644 index f011085..0000000 --- a/mall-admin/src/main/java/com/macro/mall/controller/UmsPermissionController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.macro.mall.controller; - -import com.macro.mall.common.api.CommonResult; -import com.macro.mall.dto.UmsPermissionNode; -import com.macro.mall.model.UmsPermission; -import com.macro.mall.service.UmsPermissionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 后台用户权限管理 - * Created by macro on 2018/9/29. - */ -@Controller -@Api(tags = "UmsPermissionController", description = "后台用户权限管理") -@RequestMapping("/permission") -public class UmsPermissionController { - @Autowired - private UmsPermissionService permissionService; - @ApiOperation("添加权限") - @RequestMapping(value = "/create", method = RequestMethod.POST) - @ResponseBody - public CommonResult create(@RequestBody UmsPermission permission) { - int count = permissionService.create(permission); - if(count>0){ - return CommonResult.success(count); - } - return CommonResult.failed(); - } - - @ApiOperation("修改权限") - @RequestMapping(value = "/update/{id}", method = RequestMethod.POST) - @ResponseBody - public CommonResult update(@PathVariable Long id, @RequestBody UmsPermission permission) { - int count = permissionService.update(id,permission); - if(count>0){ - return CommonResult.success(count); - } - return CommonResult.failed(); - } - - @ApiOperation("根据id批量删除权限") - @RequestMapping(value = "/delete", method = RequestMethod.POST) - @ResponseBody - public CommonResult delete(@RequestParam("ids") List ids) { - int count = permissionService.delete(ids); - if(count>0){ - return CommonResult.success(count); - } - return CommonResult.failed(); - } - - @ApiOperation("以层级结构返回所有权限") - @RequestMapping(value = "/treeList", method = RequestMethod.GET) - @ResponseBody - public CommonResult> treeList() { - List permissionNodeList = permissionService.treeList(); - return CommonResult.success(permissionNodeList); - } - - @ApiOperation("获取所有权限列表") - @RequestMapping(value = "/list", method = RequestMethod.GET) - @ResponseBody - public CommonResult> list() { - List permissionList = permissionService.list(); - return CommonResult.success(permissionList); - } -} diff --git a/mall-admin/src/main/java/com/macro/mall/controller/UmsRoleController.java b/mall-admin/src/main/java/com/macro/mall/controller/UmsRoleController.java index a4b2d82..1df0b30 100644 --- a/mall-admin/src/main/java/com/macro/mall/controller/UmsRoleController.java +++ b/mall-admin/src/main/java/com/macro/mall/controller/UmsRoleController.java @@ -56,26 +56,6 @@ public class UmsRoleController { return CommonResult.failed(); } - @ApiOperation("获取相应角色权限") - @RequestMapping(value = "/permission/{roleId}", method = RequestMethod.GET) - @ResponseBody - public CommonResult> getPermissionList(@PathVariable Long roleId) { - List permissionList = roleService.getPermissionList(roleId); - return CommonResult.success(permissionList); - } - - @ApiOperation("修改角色权限") - @RequestMapping(value = "/permission/update", method = RequestMethod.POST) - @ResponseBody - public CommonResult updatePermission(@RequestParam Long roleId, - @RequestParam("permissionIds") List permissionIds) { - int count = roleService.updatePermission(roleId, permissionIds); - if (count > 0) { - return CommonResult.success(count); - } - return CommonResult.failed(); - } - @ApiOperation("获取所有角色") @RequestMapping(value = "/listAll", method = RequestMethod.GET) @ResponseBody diff --git a/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminPermissionRelationDao.java b/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminPermissionRelationDao.java deleted file mode 100644 index 6493161..0000000 --- a/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminPermissionRelationDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.macro.mall.dao; - -import com.macro.mall.model.UmsAdminPermissionRelation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 自定义用户权限关系管理Dao - * Created by macro on 2018/10/8. - */ -public interface UmsAdminPermissionRelationDao { - /** - * 批量创建 - */ - int insertList(@Param("list") List list); -} diff --git a/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminRoleRelationDao.java b/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminRoleRelationDao.java index fe55396..d96a416 100644 --- a/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminRoleRelationDao.java +++ b/mall-admin/src/main/java/com/macro/mall/dao/UmsAdminRoleRelationDao.java @@ -1,7 +1,6 @@ package com.macro.mall.dao; import com.macro.mall.model.UmsAdminRoleRelation; -import com.macro.mall.model.UmsPermission; import com.macro.mall.model.UmsResource; import com.macro.mall.model.UmsRole; import org.apache.ibatis.annotations.Param; @@ -23,16 +22,6 @@ public interface UmsAdminRoleRelationDao { */ List getRoleList(@Param("adminId") Long adminId); - /** - * 获取用户所有角色权限 - */ - List getRolePermissionList(@Param("adminId") Long adminId); - - /** - * 获取用户所有权限(包括+-权限) - */ - List getPermissionList(@Param("adminId") Long adminId); - /** * 获取用户所有可访问资源 */ diff --git a/mall-admin/src/main/java/com/macro/mall/dao/UmsRolePermissionRelationDao.java b/mall-admin/src/main/java/com/macro/mall/dao/UmsRolePermissionRelationDao.java deleted file mode 100644 index 795d573..0000000 --- a/mall-admin/src/main/java/com/macro/mall/dao/UmsRolePermissionRelationDao.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.macro.mall.dao; - -import com.macro.mall.model.UmsPermission; -import com.macro.mall.model.UmsRolePermissionRelation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 自定义角色权限关系管理Dao - * Created by macro on 2018/9/30. - */ -public interface UmsRolePermissionRelationDao { - /** - * 批量插入角色和权限关系 - */ - int insertList(@Param("list")List list); - - /** - * 根据角色获取权限 - */ - List getPermissionList(@Param("roleId") Long roleId); -} diff --git a/mall-admin/src/main/java/com/macro/mall/dto/UmsPermissionNode.java b/mall-admin/src/main/java/com/macro/mall/dto/UmsPermissionNode.java deleted file mode 100644 index d38fc65..0000000 --- a/mall-admin/src/main/java/com/macro/mall/dto/UmsPermissionNode.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.macro.mall.dto; - -import com.macro.mall.model.UmsPermission; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * 后台权限节点封装 - * Created by macro on 2018/9/30. - */ -public class UmsPermissionNode extends UmsPermission { - @Getter - @Setter - @ApiModelProperty(value = "子级权限") - private List children; -} diff --git a/mall-admin/src/main/java/com/macro/mall/service/UmsAdminService.java b/mall-admin/src/main/java/com/macro/mall/service/UmsAdminService.java index fc241f6..b9363f6 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/UmsAdminService.java +++ b/mall-admin/src/main/java/com/macro/mall/service/UmsAdminService.java @@ -3,7 +3,6 @@ package com.macro.mall.service; import com.macro.mall.dto.UmsAdminParam; import com.macro.mall.dto.UpdateAdminPasswordParam; import com.macro.mall.model.UmsAdmin; -import com.macro.mall.model.UmsPermission; import com.macro.mall.model.UmsResource; import com.macro.mall.model.UmsRole; import org.springframework.security.core.userdetails.UserDetails; @@ -76,17 +75,6 @@ public interface UmsAdminService { */ List getResourceList(Long adminId); - /** - * 修改用户的+-权限 - */ - @Transactional - int updatePermission(Long adminId, List permissionIds); - - /** - * 获取用户所有权限（包括角色权限和+-权限） - */ - List getPermissionList(Long adminId); - /** * 修改密码 */ diff --git a/mall-admin/src/main/java/com/macro/mall/service/UmsPermissionService.java b/mall-admin/src/main/java/com/macro/mall/service/UmsPermissionService.java deleted file mode 100644 index 9fa410d..0000000 --- a/mall-admin/src/main/java/com/macro/mall/service/UmsPermissionService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.macro.mall.service; - -import com.macro.mall.dto.UmsPermissionNode; -import com.macro.mall.model.UmsPermission; - -import java.util.List; - -/** - * 后台用户权限管理Service - * Created by macro on 2018/9/29. - */ -public interface UmsPermissionService { - /** - * 添加权限 - */ - int create(UmsPermission permission); - - /** - * 修改权限 - */ - int update(Long id,UmsPermission permission); - - /** - * 批量删除权限 - */ - int delete(List ids); - - /** - * 以层级结构返回所有权限 - */ - List treeList(); - - /** - * 获取所有权限 - */ - List list(); -} diff --git a/mall-admin/src/main/java/com/macro/mall/service/UmsRoleService.java b/mall-admin/src/main/java/com/macro/mall/service/UmsRoleService.java index c157a11..c54cefb 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/UmsRoleService.java +++ b/mall-admin/src/main/java/com/macro/mall/service/UmsRoleService.java @@ -1,7 +1,6 @@ package com.macro.mall.service; import com.macro.mall.model.UmsMenu; -import com.macro.mall.model.UmsPermission; import com.macro.mall.model.UmsResource; import com.macro.mall.model.UmsRole; import org.springframework.transaction.annotation.Transactional; @@ -28,17 +27,6 @@ public interface UmsRoleService { */ int delete(List ids); - /** - * 获取指定角色权限 - */ - List getPermissionList(Long roleId); - - /** - * 修改指定角色的权限 - */ - @Transactional - int updatePermission(Long roleId, List permissionIds); - /** * 获取所有角色列表 */ diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java index 796f90a..37b9ae6 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java @@ -5,13 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.macro.mall.bo.AdminUserDetails; import com.macro.mall.common.exception.Asserts; -import com.macro.mall.dao.UmsAdminPermissionRelationDao; import com.macro.mall.dao.UmsAdminRoleRelationDao; import com.macro.mall.dto.UmsAdminParam; import com.macro.mall.dto.UpdateAdminPasswordParam; import com.macro.mall.mapper.UmsAdminLoginLogMapper; import com.macro.mall.mapper.UmsAdminMapper; -import com.macro.mall.mapper.UmsAdminPermissionRelationMapper; import com.macro.mall.mapper.UmsAdminRoleRelationMapper; import com.macro.mall.model.*; import com.macro.mall.security.util.JwtTokenUtil; @@ -21,7 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; @@ -38,7 +35,6 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * UmsAdminService实现类 @@ -58,10 +54,6 @@ public class UmsAdminServiceImpl implements UmsAdminService { @Autowired private UmsAdminRoleRelationDao adminRoleRelationDao; @Autowired - private UmsAdminPermissionRelationMapper adminPermissionRelationMapper; - @Autowired - private UmsAdminPermissionRelationDao adminPermissionRelationDao; - @Autowired private UmsAdminLoginLogMapper loginLogMapper; @Autowired private UmsAdminCacheService adminCacheService; @@ -241,48 +233,6 @@ public class UmsAdminServiceImpl implements UmsAdminService { return resourceList; } - @Override - public int updatePermission(Long adminId, List permissionIds) { - //删除原所有权限关系 - UmsAdminPermissionRelationExample relationExample = new UmsAdminPermissionRelationExample(); - relationExample.createCriteria().andAdminIdEqualTo(adminId); - adminPermissionRelationMapper.deleteByExample(relationExample); - //获取用户所有角色权限 - List permissionList = adminRoleRelationDao.getRolePermissionList(adminId); - List rolePermissionList = permissionList.stream().map(UmsPermission::getId).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(permissionIds)) { - List relationList = new ArrayList<>(); - //筛选出+权限 - List addPermissionIdList = permissionIds.stream().filter(permissionId -> !rolePermissionList.contains(permissionId)).collect(Collectors.toList()); - //筛选出-权限 - List subPermissionIdList = rolePermissionList.stream().filter(permissionId -> !permissionIds.contains(permissionId)).collect(Collectors.toList()); - //插入+-权限关系 - relationList.addAll(convert(adminId,1,addPermissionIdList)); - relationList.addAll(convert(adminId,-1,subPermissionIdList)); - return adminPermissionRelationDao.insertList(relationList); - } - return 0; - } - - /** - * 将+-权限关系转化为对象 - */ - private List convert(Long adminId,Integer type,List permissionIdList) { - List relationList = permissionIdList.stream().map(permissionId -> { - UmsAdminPermissionRelation relation = new UmsAdminPermissionRelation(); - relation.setAdminId(adminId); - relation.setType(type); - relation.setPermissionId(permissionId); - return relation; - }).collect(Collectors.toList()); - return relationList; - } - - @Override - public List getPermissionList(Long adminId) { - return adminRoleRelationDao.getPermissionList(adminId); - } - @Override public int updatePassword(UpdateAdminPasswordParam param) { if(StrUtil.isEmpty(param.getUsername()) diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsPermissionServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/UmsPermissionServiceImpl.java deleted file mode 100644 index e038331..0000000 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsPermissionServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.macro.mall.service.impl; - -import com.macro.mall.dto.UmsPermissionNode; -import com.macro.mall.mapper.UmsPermissionMapper; -import com.macro.mall.model.UmsPermission; -import com.macro.mall.model.UmsPermissionExample; -import com.macro.mall.service.UmsPermissionService; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 后台用户权限管理Service实现类 - * Created by macro on 2018/9/29. - */ -@Service -public class UmsPermissionServiceImpl implements UmsPermissionService { - @Autowired - private UmsPermissionMapper permissionMapper; - - @Override - public int create(UmsPermission permission) { - permission.setStatus(1); - permission.setCreateTime(new Date()); - permission.setSort(0); - return permissionMapper.insert(permission); - } - - @Override - public int update(Long id, UmsPermission permission) { - permission.setId(id); - return permissionMapper.updateByPrimaryKey(permission); - } - - @Override - public int delete(List ids) { - UmsPermissionExample example = new UmsPermissionExample(); - example.createCriteria().andIdIn(ids); - return permissionMapper.deleteByExample(example); - } - - @Override - public List treeList() { - List permissionList = permissionMapper.selectByExample(new UmsPermissionExample()); - List result = permissionList.stream() - .filter(permission -> permission.getPid().equals(0L)) - .map(permission -> covert(permission,permissionList)).collect(Collectors.toList()); - return result; - } - - @Override - public List list() { - return permissionMapper.selectByExample(new UmsPermissionExample()); - } - - /** - * 将权限转换为带有子级的权限对象 - * 当找不到子级权限的时候map操作不会再递归调用covert - */ - private UmsPermissionNode covert(UmsPermission permission,List permissionList){ - UmsPermissionNode node = new UmsPermissionNode(); - BeanUtils.copyProperties(permission,node); - List children = permissionList.stream() - .filter(subPermission -> subPermission.getPid().equals(permission.getId())) - .map(subPermission -> covert(subPermission,permissionList)).collect(Collectors.toList()); - node.setChildren(children); - return node; - } -} diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsRoleServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/UmsRoleServiceImpl.java index adcb543..c2c6d50 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/UmsRoleServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/UmsRoleServiceImpl.java @@ -2,10 +2,8 @@ package com.macro.mall.service.impl; import com.github.pagehelper.PageHelper; import com.macro.mall.dao.UmsRoleDao; -import com.macro.mall.dao.UmsRolePermissionRelationDao; import com.macro.mall.mapper.UmsRoleMapper; import com.macro.mall.mapper.UmsRoleMenuRelationMapper; -import com.macro.mall.mapper.UmsRolePermissionRelationMapper; import com.macro.mall.mapper.UmsRoleResourceRelationMapper; import com.macro.mall.model.*; import com.macro.mall.service.UmsAdminCacheService; @@ -14,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,14 +24,10 @@ public class UmsRoleServiceImpl implements UmsRoleService { @Autowired private UmsRoleMapper roleMapper; @Autowired - private UmsRolePermissionRelationMapper rolePermissionRelationMapper; - @Autowired private UmsRoleMenuRelationMapper roleMenuRelationMapper; @Autowired private UmsRoleResourceRelationMapper roleResourceRelationMapper; @Autowired - private UmsRolePermissionRelationDao rolePermissionRelationDao; - @Autowired private UmsRoleDao roleDao; @Autowired private UmsAdminCacheService adminCacheService; @@ -61,28 +54,6 @@ public class UmsRoleServiceImpl implements UmsRoleService { return count; } - @Override - public List getPermissionList(Long roleId) { - return rolePermissionRelationDao.getPermissionList(roleId); - } - - @Override - public int updatePermission(Long roleId, List permissionIds) { - //先删除原有关系 - UmsRolePermissionRelationExample example=new UmsRolePermissionRelationExample(); - example.createCriteria().andRoleIdEqualTo(roleId); - rolePermissionRelationMapper.deleteByExample(example); - //批量插入新关系 - List relationList = new ArrayList<>(); - for (Long permissionId : permissionIds) { - UmsRolePermissionRelation relation = new UmsRolePermissionRelation(); - relation.setRoleId(roleId); - relation.setPermissionId(permissionId); - relationList.add(relation); - } - return rolePermissionRelationDao.insertList(relationList); - } - @Override public List list() { return roleMapper.selectByExample(new UmsRoleExample()); diff --git a/mall-admin/src/main/resources/dao/UmsAdminPermissionRelationDao.xml b/mall-admin/src/main/resources/dao/UmsAdminPermissionRelationDao.xml deleted file mode 100644 index 4ce5e63..0000000 --- a/mall-admin/src/main/resources/dao/UmsAdminPermissionRelationDao.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - INSERT INTO ums_admin_permission_relation (admin_id, permission_id, type) VALUES - - (#{item.adminId,jdbcType=BIGINT}, - #{item.permissionId,jdbcType=BIGINT}, - #{item.type,jdbcType=INTEGER}) - - - \ No newline at end of file diff --git a/mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml b/mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml index badc580..d43ecb8 100644 --- a/mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml +++ b/mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml @@ -14,44 +14,6 @@ from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id where ar.admin_id = #{adminId} - - - SELECT - p.* - FROM - ums_role_permission_relation r - LEFT JOIN ums_permission p ON r.permission_id = p.id - WHERE - r.role_id = #{roleId}; - - \ No newline at end of file