新增获取角色列表，调整文件结构

api/controller/basic.go

@@ -26,15 +26,15 @@ func (b *Basic) GetCaptcha(c *gin.Context) {
 
 // Login 登陆
 func (b *Basic) Login(c *gin.Context) {
-	var login requests.Login
+	var basicRequest requests.BasicRequest
 
-	if err := c.ShouldBind(&login); err != nil {
+	if err := c.ShouldBind(&basicRequest.Login); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(login); err != nil {
+	if err := global.Validate.Struct(basicRequest.Login); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
@@ -48,8 +48,8 @@ func (b *Basic) Login(c *gin.Context) {
 	// }
 
 	// 登陆
-	Basic := service.Basic{}
-	token, err := Basic.Login(login)
+	BasicService := service.BasicService{}
+	token, err := BasicService.Login(basicRequest.Login)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return

api/controller/role.go

@@ -2,8 +2,12 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
+	"hospital-admin-api/api/dao"
+	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
 	"hospital-admin-api/api/service"
+	"hospital-admin-api/global"
+	"hospital-admin-api/utils"
 )
 
 type Role struct{}
@@ -17,8 +21,8 @@ func (r *Role) GetRoleMenuList(c *gin.Context) {
 	}
 
 	// 登陆
-	Role := service.Role{}
-	roleMenuList, err := Role.GetRoleMenuList(roleId)
+	RoleService := service.RoleService{}
+	roleMenuList, err := RoleService.GetRoleMenuList(roleId)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
@@ -31,3 +35,37 @@ func (r *Role) GetRoleMenuList(c *gin.Context) {
 
 	responses.OkWithData(roleMenuList, c)
 }
+
+// GetRoleList 获取角色列表
+func (r *Role) GetRoleList(c *gin.Context) {
+	var RoleRequest requests.RoleRequest
+
+	if err := c.ShouldBind(&RoleRequest.GetRoleList); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(RoleRequest.GetRoleList); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	if RoleRequest.GetRoleList.Page == 0 {
+		RoleRequest.GetRoleList.Page = 1
+	}
+
+	if RoleRequest.GetRoleList.PageSize == 0 {
+		RoleRequest.GetRoleList.PageSize = 20
+	}
+
+	AdminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := AdminRoleDao.GetAdminRolePageSearch(RoleRequest.GetRoleList.RoleName, RoleRequest.GetRoleList.Page, RoleRequest.GetRoleList.PageSize)
+	if err != nil || len(adminRole) == 0 {
+		responses.Ok(c)
+		c.Abort()
+		return
+	}
+
+	responses.OkWithData(adminRole, c)
+}