bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

rolecanteentype0318

This commit is contained in:
sxu 2025-03-18 15:44:18 +08:00
parent 02b87a316e
commit a466bd2092
8 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleCanteenVo.java Normal file
View File

@ -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;
}

11
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
View File

@ -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<RoleCanteenVo> roleCanteenList;
/** 角色菜单权限 */
private Set<String> permissions;
@ -265,12 +266,12 @@ public class SysRole extends BaseEntity
this.areaIds = areaIds;
}
public String[] getDataIds() {
return dataIds;
public List<RoleCanteenVo> getRoleCanteenList() {
return roleCanteenList;
}
public void setDataIds(String[] dataIds) {
this.dataIds = dataIds;
public void setRoleCanteenList(List<RoleCanteenVo> roleCanteenList) {
this.roleCanteenList = roleCanteenList;
}
public Set<String> getPermissions()

44
bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleCanteen.java
View File

@ -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();
}
}

5
bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleAreaMapper.java
View File

@ -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<SysRoleArea> roleAreaList);
public int batchRoleCanteen(List<SysRoleCanteen> roleCanteenList);
public int batchRoleCanteen(List<RoleCanteenVo> roleCanteenList);
}

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java
View File

@ -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<String> getAreaIdsByRoleId(Long roleId);
public List<String> getDataIdsByRoleId(Long roleId);
public List<RoleCanteenVo> getDataIdsByRoleId(Long roleId);
}

16
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
View File

@ -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<SysRole> roles = roleMapper.selectRoleList(role);
for (SysRole r : roles) {
List<String> areaIds = roleMapper.getAreaIdsByRoleId(r.getRoleId());
List<String> dataIds = roleMapper.getDataIdsByRoleId(r.getRoleId());
List<RoleCanteenVo> 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<SysRoleCanteen> list = new ArrayList<SysRoleCanteen>();
for (String dataId : role.getDataIds())
List<RoleCanteenVo> list = new ArrayList<RoleCanteenVo>();
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)

4
bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleAreaMapper.xml
View File

@ -36,9 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<insert id="batchRoleCanteen">
insert into sys_role_canteen(role_id, data_id) values
insert into sys_role_canteen(role_id, data_id, type) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.dataId})
(#{item.roleId},#{item.dataId},#{item.type})
</foreach>
</insert>
</mapper>

4
bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -182,8 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where role_id = #{roleId}
</select>
<select id="getDataIdsByRoleId" resultType="String">
select data_id
<select id="getDataIdsByRoleId" resultType="com.bonus.system.api.domain.RoleCanteenVo">
select role_id, data_id, type
from sys_role_canteen
where role_id = #{roleId}
</select>