From 77e75111574f754b0d4a740c5f7ed4097a6cb436 Mon Sep 17 00:00:00 2001 From: MrZhai Date: Sat, 12 Mar 2022 14:22:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=202.=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8SQL=20CREATE=20TABLE=20`spms`.`basic=5Fbussiness=5Ftyp?= =?UTF-8?q?e=5Frole`=20=20(=20=20=20`id`=20int(11)=20NOT=20NULL=20AUTO=5FI?= =?UTF-8?q?NCREMENT=20COMMENT=20'id',=20=20=20`role=5Fid`=20int=20NULL=20C?= =?UTF-8?q?OMMENT=20'=E8=A7=92=E8=89=B2id',=20=20=20`action`=20varchar(255?= =?UTF-8?q?)=20NULL=20COMMENT=20'=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B',=20?= =?UTF-8?q?=20=20PRIMARY=20KEY=20(`id`)=20);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthRoleController.java | 27 ++++++++++++++++ .../dao/basic/BasicBussinessTypeRoleDao.java | 27 ++++++++++++++++ .../basic/BasicBussinessTypeRoleEntity.java | 19 ++++++++++++ .../admin/service/auth/AuthRoleService.java | 16 ++++++++++ .../auth/impl/AuthRoleServiceImpl.java | 31 +++++++++++++++++++ .../mapper/basic/BussinessTypeRoleDao.xml | 26 ++++++++++++++++ 6 files changed, 146 insertions(+) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBussinessTypeRoleDao.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBussinessTypeRoleEntity.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeRoleDao.xml diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java index 742fed3..52fc8c5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java @@ -1,10 +1,12 @@ package com.glxp.sale.admin.controller.auth; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthPermission; import com.glxp.sale.admin.entity.auth.AuthPermissionRule; import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.sale.admin.req.auth.AuthRoleAuthRequest; import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; import com.glxp.sale.admin.req.auth.AuthRoleSaveRequest; @@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -221,4 +224,28 @@ public class AuthRoleController { } + @AuthRuleAnnotation("") + @GetMapping("/admin/auth/role/getBussinessTypeRole") + public BaseResponse getBussinessTypeRole(Long roleId){ + if (null == roleId) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + List data = authRoleService.getBussinessTypeRole(roleId); + return ResultVOUtils.success(data); + } + + //@AuthRuleAnnotation("") + @PostMapping("/admin/auth/role/updateBussinessTypeRole") + public BaseResponse updateBussinessTypeRole(Long roleId, String actions) { + if (null == roleId) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + if (StrUtil.isNotBlank(actions)) { + String[] split = actions.split(","); + authRoleService.updateBussinessTypeRole(roleId, Arrays.asList(split)); + } + return ResultVOUtils.success(); + } + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBussinessTypeRoleDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBussinessTypeRoleDao.java new file mode 100644 index 0000000..8351413 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBussinessTypeRoleDao.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.dao.basic; + +import com.glxp.sale.admin.entity.basic.BasicBussinessTypeRoleEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicBussinessTypeRoleDao { + + public List getListByRoleId(@Param("roleId") Long roleId); + + /** + * 删除此角色下所有的扫码单据类型授权数据 + * + * @param roleId + */ + void deleteByRoleId(@Param("roleId") Long roleId); + + /** + * 插入授权数据 + * + * @param basicBussinessTypeRoleEntities + */ + void insert(@Param("basicBussinessTypeRoleEntities") List basicBussinessTypeRoleEntities); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBussinessTypeRoleEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBussinessTypeRoleEntity.java new file mode 100644 index 0000000..046a64c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBussinessTypeRoleEntity.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +/** + * 扫码单据类型和角色关联表 + */ +@Data +public class BasicBussinessTypeRoleEntity { + + private Integer id; + + //角色id + private Long role_id; + + //业务类型 + private String action; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java index 00155c2..dfe672c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.auth; import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; import java.util.List; @@ -24,4 +25,19 @@ public interface AuthRoleService { boolean deleteById(Long id); + /** + * 查询角色扫码单据授权数据 + * + * @param roleId + * @return + */ + List getBussinessTypeRole(Long roleId); + + /** + * 更新角色扫码单据类型授权数据 + * + * @param roleId + * @param actions + */ + void updateBussinessTypeRole(Long roleId, List actions); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java index aa20358..efb17fe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java @@ -2,12 +2,15 @@ package com.glxp.sale.admin.service.auth.impl; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.auth.AuthRoleDao; +import com.glxp.sale.admin.dao.basic.BasicBussinessTypeRoleDao; import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; import com.glxp.sale.admin.service.auth.AuthRoleService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -16,9 +19,12 @@ public class AuthRoleServiceImpl implements AuthRoleService { @Resource private AuthRoleDao authRoleDao; + @Resource + private BasicBussinessTypeRoleDao basicBussinessTypeRoleDao; /** * 查询列表 + * * @return */ @Override @@ -31,6 +37,7 @@ public class AuthRoleServiceImpl implements AuthRoleService { /** * 查询管理员页面的列表 + * * @param page * @param limit * @param status @@ -48,6 +55,7 @@ public class AuthRoleServiceImpl implements AuthRoleService { /** * 根据名称查询 + * * @param name * @return */ @@ -58,6 +66,7 @@ public class AuthRoleServiceImpl implements AuthRoleService { /** * 插入 + * * @param authRole * @return */ @@ -72,6 +81,7 @@ public class AuthRoleServiceImpl implements AuthRoleService { /** * 修改 + * * @param authRole * @return */ @@ -103,6 +113,7 @@ public class AuthRoleServiceImpl implements AuthRoleService { /** * 删除 + * * @param id * @return */ @@ -110,4 +121,24 @@ public class AuthRoleServiceImpl implements AuthRoleService { public boolean deleteById(Long id) { return authRoleDao.deleteById(id); } + + @Override + public List getBussinessTypeRole(Long roleId) { + return basicBussinessTypeRoleDao.getListByRoleId(roleId); + } + + @Override + public void updateBussinessTypeRole(Long roleId, List actions) { + //删除之前的扫码单据类型授权数据 + basicBussinessTypeRoleDao.deleteByRoleId(roleId); + //添加新的扫码单据数据类型 + List data = new ArrayList<>(actions.size()); + actions.forEach(action -> { + BasicBussinessTypeRoleEntity entity = new BasicBussinessTypeRoleEntity(); + entity.setRole_id(roleId); + entity.setAction(action); + data.add(entity); + }); + basicBussinessTypeRoleDao.insert(data); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeRoleDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeRoleDao.xml new file mode 100644 index 0000000..e329a5e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeRoleDao.xml @@ -0,0 +1,26 @@ + + + + + + + + delete + from basic_bussiness_type_role + where role_id = #{roleId} + + + + insert into basic_bussiness_type_role + (role_id, action) + values + + (#{item.role_id}, + #{item.action}) + + +