From a466bd2092c948c2162703b4aae2b6a0aba14709 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 18 Mar 2025 15:44:18 +0800 Subject: [PATCH] rolecanteentype0318 --- .../system/api/domain/RoleCanteenVo.java | 16 +++++++ .../com/bonus/system/api/domain/SysRole.java | 11 ++--- .../bonus/system/domain/SysRoleCanteen.java | 44 ------------------- .../system/mapper/SysRoleAreaMapper.java | 5 +-- .../bonus/system/mapper/SysRoleMapper.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 16 +++---- .../mapper/system/SysRoleAreaMapper.xml | 4 +- .../resources/mapper/system/SysRoleMapper.xml | 4 +- 8 files changed, 39 insertions(+), 65 deletions(-) create mode 100644 bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleCanteenVo.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleCanteen.java diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleCanteenVo.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleCanteenVo.java new file mode 100644 index 0000000..7788dec --- /dev/null +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleCanteenVo.java @@ -0,0 +1,16 @@ +package com.bonus.system.api.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel("区域食堂档口权限") +@Data +public class RoleCanteenVo { + @ApiModelProperty("角色ID") + private Long roleId; + @ApiModelProperty("区域、食堂、档口ID") + private String dataId; + @ApiModelProperty("类型：0：区域，1：食堂，2：档口或餐线") + private Integer type; +} diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index a7f97cb..adba6c9 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -1,5 +1,6 @@ package com.bonus.system.api.domain; +import java.util.List; import java.util.Set; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -80,7 +81,7 @@ public class SysRole extends BaseEntity private String[] areaIds; - private String[] dataIds; + private List roleCanteenList; /** 角色菜单权限 */ private Set permissions; @@ -265,12 +266,12 @@ public class SysRole extends BaseEntity this.areaIds = areaIds; } - public String[] getDataIds() { - return dataIds; + public List getRoleCanteenList() { + return roleCanteenList; } - public void setDataIds(String[] dataIds) { - this.dataIds = dataIds; + public void setRoleCanteenList(List roleCanteenList) { + this.roleCanteenList = roleCanteenList; } public Set getPermissions() diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleCanteen.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleCanteen.java deleted file mode 100644 index 3c52232..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleCanteen.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.bonus.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和食堂等关联 sys_role_canteen - * - * @author bonus - */ -public class SysRoleCanteen -{ - /** 角色ID */ - private Long roleId; - - /** 区域、食堂、档口ID */ - private String dataId; - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public String getDataId() { - return dataId; - } - - public void setDataId(String dataId) { - this.dataId = dataId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("dataId", getDataId()) - .toString(); - } -} diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleAreaMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleAreaMapper.java index 548953f..dfcca09 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleAreaMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleAreaMapper.java @@ -1,8 +1,7 @@ package com.bonus.system.mapper; +import com.bonus.system.api.domain.RoleCanteenVo; import com.bonus.system.domain.SysRoleArea; -import com.bonus.system.domain.SysRoleCanteen; -import com.bonus.system.domain.SysRoleDept; import java.util.List; @@ -47,5 +46,5 @@ public interface SysRoleAreaMapper */ public int batchRoleArea(List roleAreaList); - public int batchRoleCanteen(List roleCanteenList); + public int batchRoleCanteen(List roleCanteenList); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java index 07ad027..4da1371 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java @@ -1,6 +1,8 @@ package com.bonus.system.mapper; import java.util.List; + +import com.bonus.system.api.domain.RoleCanteenVo; import com.bonus.system.api.domain.SysRole; /** @@ -107,5 +109,5 @@ public interface SysRoleMapper public List getAreaIdsByRoleId(Long roleId); - public List getDataIdsByRoleId(Long roleId); + public List getDataIdsByRoleId(Long roleId); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index 7b3990b..18b2dd0 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -7,11 +7,10 @@ import java.util.List; import java.util.Set; import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.common.datascope.enums.DataTypeEnum; import com.bonus.common.datascope.utils.CommonDataPermissionInfo; +import com.bonus.system.api.domain.RoleCanteenVo; import com.bonus.system.api.domain.SysUserRole; import com.bonus.system.domain.SysRoleArea; -import com.bonus.system.domain.SysRoleCanteen; import com.bonus.system.mapper.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -84,9 +83,9 @@ public class SysRoleServiceImpl implements ISysRoleService List roles = roleMapper.selectRoleList(role); for (SysRole r : roles) { List areaIds = roleMapper.getAreaIdsByRoleId(r.getRoleId()); - List dataIds = roleMapper.getDataIdsByRoleId(r.getRoleId()); + List roleCanteenList = roleMapper.getDataIdsByRoleId(r.getRoleId()); r.setAreaIds(areaIds.toArray(new String[areaIds.size()])); - r.setDataIds(dataIds.toArray(new String[dataIds.size()])); + r.setRoleCanteenList(roleCanteenList); } return roles; } @@ -431,12 +430,13 @@ public class SysRoleServiceImpl implements ISysRoleService { int rows = 1; // 新增角色与食堂档口（数据权限）管理 - List list = new ArrayList(); - for (String dataId : role.getDataIds()) + List list = new ArrayList(); + for (RoleCanteenVo roleCanteen : role.getRoleCanteenList()) { - SysRoleCanteen rd = new SysRoleCanteen(); + RoleCanteenVo rd = new RoleCanteenVo(); rd.setRoleId(role.getRoleId()); - rd.setDataId(dataId); + rd.setDataId(roleCanteen.getDataId()); + rd.setType(roleCanteen.getType()); list.add(rd); } if (list.size() > 0) diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleAreaMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleAreaMapper.xml index 6f6874e..aa66336 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleAreaMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleAreaMapper.xml @@ -36,9 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_role_canteen(role_id, data_id) values + insert into sys_role_canteen(role_id, data_id, type) values - (#{item.roleId},#{item.dataId}) + (#{item.roleId},#{item.dataId},#{item.type}) \ No newline at end of file diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index 427eb6a..17957dd 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -182,8 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where role_id = #{roleId} - + select role_id, data_id, type from sys_role_canteen where role_id = #{roleId}