diff --git a/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java b/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java index 59e16dc..fe78904 100644 --- a/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java +++ b/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java @@ -24,15 +24,15 @@ public class AdminPermissionCheck implements ApplicationRunner { private AdminPermissionService permissionService; private final String[][] ACTION_PERMISSIONS = { - {"管理员-查看", BPermissionConstant.ADMIN_USER_INDEX}, - {"管理员-添加", BPermissionConstant.ADMIN_USER_STORE}, - {"管理员-编辑", BPermissionConstant.ADMIN_USER_UPDATE}, - {"管理员-删除", BPermissionConstant.ADMIN_USER_DESTROY}, + {"管理员", "0", "管理员-查看", BPermissionConstant.ADMIN_USER_INDEX}, + {"管理员", "5", "管理员-添加", BPermissionConstant.ADMIN_USER_STORE}, + {"管理员", "10", "管理员-编辑", BPermissionConstant.ADMIN_USER_UPDATE}, + {"管理员", "15", "管理员-删除", BPermissionConstant.ADMIN_USER_DESTROY}, - {"部门-查看", BPermissionConstant.DEPARTMENT_INDEX}, - {"部门-添加", BPermissionConstant.DEPARTMENT_STORE}, - {"部门-编辑", BPermissionConstant.DEPARTMENT_UPDATE}, - {"部门-删除", BPermissionConstant.DEPARTMENT_DESTROY}, + {"部门", "0", "部门-查看", BPermissionConstant.DEPARTMENT_INDEX}, + {"部门", "5", "部门-添加", BPermissionConstant.DEPARTMENT_STORE}, + {"部门", "10", "部门-编辑", BPermissionConstant.DEPARTMENT_UPDATE}, + {"部门", "15", "部门-删除", BPermissionConstant.DEPARTMENT_DESTROY}, }; @Override @@ -43,14 +43,17 @@ public class AdminPermissionCheck implements ApplicationRunner { for (int i = 0; i < ACTION_PERMISSIONS.length; i++) { String[] item = ACTION_PERMISSIONS[i]; - if (slugs.get(item[1]) != null) {//已经存在 + String tmpSlug = item[3]; + if (slugs.get(tmpSlug) != null) {//已经存在 continue; } AdminPermission permission = new AdminPermission(); - permission.setName(item[0]); - permission.setSlug(item[1]); - permission.setType("action"); + permission.setGroupName(item[0]); + permission.setSort(Integer.valueOf(item[1])); + permission.setName(item[2]); + permission.setSlug(tmpSlug); + permission.setType(BPermissionConstant.TYPE_ACTION); permission.setCreatedAt(now); list.add(permission); diff --git a/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java b/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java index 9a208c1..f55c89e 100644 --- a/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java +++ b/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java @@ -6,6 +6,9 @@ package xyz.playedu.api.constant; */ public class BPermissionConstant { + public final static String TYPE_ACTION = "action"; + public final static String TYPE_DATA = "data"; + public final static String ADMIN_USER_INDEX = "admin-user-index"; public final static String ADMIN_USER_STORE = "admin-user-store"; public final static String ADMIN_USER_UPDATE = "admin-user-update"; diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminPermissionController.java b/src/main/java/xyz/playedu/api/controller/backend/AdminPermissionController.java index b200670..0136497 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AdminPermissionController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/AdminPermissionController.java @@ -19,11 +19,11 @@ import java.util.List; public class AdminPermissionController { @Autowired - private AdminPermissionService adminPermissionService; + private AdminPermissionService permissionService; @GetMapping("/index") public JsonResponse index() { - List data = adminPermissionService.list(); + List data = permissionService.listOrderBySortAsc(); return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/domain/AdminPermission.java b/src/main/java/xyz/playedu/api/domain/AdminPermission.java index 2ed37b2..e1b0640 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminPermission.java +++ b/src/main/java/xyz/playedu/api/domain/AdminPermission.java @@ -26,6 +26,16 @@ public class AdminPermission implements Serializable { */ private String type; + /** + * 分组 + */ + private String groupName; + + /** + * 升序 + */ + private Integer sort; + /** * 权限名 */ @@ -58,6 +68,8 @@ public class AdminPermission implements Serializable { AdminPermission other = (AdminPermission) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getGroupName() == null ? other.getGroupName() == null : this.getGroupName().equals(other.getGroupName())) + && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getSlug() == null ? other.getSlug() == null : this.getSlug().equals(other.getSlug())) && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt())); @@ -69,6 +81,8 @@ public class AdminPermission implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); + result = prime * result + ((getGroupName() == null) ? 0 : getGroupName().hashCode()); + result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getSlug() == null) ? 0 : getSlug().hashCode()); result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode()); @@ -83,6 +97,8 @@ public class AdminPermission implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", type=").append(type); + sb.append(", groupName=").append(groupName); + sb.append(", sort=").append(sort); sb.append(", name=").append(name); sb.append(", slug=").append(slug); sb.append(", createdAt=").append(createdAt); diff --git a/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java b/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java index 5a9eb54..bfebc15 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java @@ -5,11 +5,11 @@ import xyz.playedu.api.domain.AdminPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @author tengteng - * @description 针对表【admin_permissions】的数据库操作Mapper - * @createDate 2023-02-20 14:27:50 - * @Entity xyz.playedu.api.domain.AdminPermission - */ +* @author tengteng +* @description 针对表【admin_permissions】的数据库操作Mapper +* @createDate 2023-02-21 15:37:02 +* @Entity xyz.playedu.api.domain.AdminPermission +*/ @Mapper public interface AdminPermissionMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/service/AdminPermissionService.java b/src/main/java/xyz/playedu/api/service/AdminPermissionService.java index 82fce9b..fd5e34f 100644 --- a/src/main/java/xyz/playedu/api/service/AdminPermissionService.java +++ b/src/main/java/xyz/playedu/api/service/AdminPermissionService.java @@ -4,6 +4,7 @@ import xyz.playedu.api.domain.AdminPermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.HashMap; +import java.util.List; /** * @author tengteng @@ -14,4 +15,6 @@ public interface AdminPermissionService extends IService { HashMap allSlugs(); + List listOrderBySortAsc(); + } diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java index 627c88f..a5c3a0a 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java @@ -26,6 +26,11 @@ public class AdminPermissionServiceImpl extends ServiceImpl listOrderBySortAsc() { + return list(query().getWrapper().orderByAsc("group_name", "sort")); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e3bde8b..1ec1c73 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,5 @@ +server: + port: 9898 spring: profiles: active: "dev" diff --git a/src/main/resources/mapper/AdminPermissionMapper.xml b/src/main/resources/mapper/AdminPermissionMapper.xml index b32540f..93225d6 100644 --- a/src/main/resources/mapper/AdminPermissionMapper.xml +++ b/src/main/resources/mapper/AdminPermissionMapper.xml @@ -7,13 +7,16 @@ + + - id,type,name, - slug,created_at + id,type,group_name, + sort,name,slug, + created_at