diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java index 3a2baeed..722a655e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java @@ -29,7 +29,7 @@ public class AuthServiceImpl implements IAuthService { ret.add("*"); return ret; } else { - + } return ret; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemRoleMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemRoleMenuServiceImpl.java new file mode 100644 index 00000000..02849ec0 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemRoleMenuServiceImpl.java @@ -0,0 +1,22 @@ +package com.mdd.admin.service.impl.system; + +import com.mdd.admin.service.system.ISystemRoleMenuService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 角色菜单关系实现类 + */ +@Service +public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService { + + + @Override + public List getMenuIdsByRoleIds(List roleIds) { + List ret = new ArrayList<>(); + + return ret; + } +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemRoleMenuService.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemRoleMenuService.java new file mode 100644 index 00000000..ee920131 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemRoleMenuService.java @@ -0,0 +1,17 @@ +package com.mdd.admin.service.system; + + +import java.util.List; + +/** + * 角色菜单关系接口类 + */ +public interface ISystemRoleMenuService { + + /** + * 根据roleIds 返回menuIds + * @param roleIds + * @return + */ + List getMenuIdsByRoleIds(List roleIds); +} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRole.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRole.java index abf6410a..f340d9a1 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRole.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRole.java @@ -1,7 +1,9 @@ package com.mdd.common.entity.system; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import io.lettuce.core.dynamic.annotation.Key; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,6 +24,7 @@ public class SystemRole implements Serializable { private String name; @ApiModelProperty("描述") + @TableField(value = "`desc`") private String desc; @ApiModelProperty("角色排序") diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java new file mode 100644 index 00000000..18fe1723 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java @@ -0,0 +1,23 @@ +package com.mdd.common.entity.system; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("角色菜单关系实体") +public class SystemRoleMenu implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("角色ID") + private Integer roleId; + + @ApiModelProperty("菜单ID") + private Integer menuId; + +} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemRoleMenuMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemRoleMenuMapper.java new file mode 100644 index 00000000..93431079 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemRoleMenuMapper.java @@ -0,0 +1,13 @@ +package com.mdd.common.mapper.system; + +import com.mdd.common.core.basics.IBaseMapper; +import com.mdd.common.entity.system.SystemMenu; +import com.mdd.common.entity.system.SystemRoleMenu; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统菜单Mapper + */ +@Mapper +public interface SystemRoleMenuMapper extends IBaseMapper { +}