gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
admin
2023-06-13 08:48:07 +08:00
parent c4d8dd6791
commit 4a9c5b9c4d
16 changed files with 111 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/dao/adminMenu.go
+3 -3
View File
@@ -5,10 +5,10 @@ import (
"hospital-admin-api/global"
)
type AdminMenu struct {
type AdminMenuDao struct {
}
func (r *AdminMenu) GetAdminMenuList() (m []*model.AdminMenu, err error) {
func (r *AdminMenuDao) GetAdminMenuList() (m []*model.AdminMenu, err error) {
err = global.Db.Find(&m).Error
if err != nil {
return nil, err
@@ -16,7 +16,7 @@ func (r *AdminMenu) GetAdminMenuList() (m []*model.AdminMenu, err error) {
return m, nil
}
func (r *AdminMenu) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err error) {
func (r *AdminMenuDao) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err error) {
err = global.Db.Order("order_num asc").Find(&m).Error
if err != nil {
return nil, err
api/dao/adminMenuApi.go
+2 -2
View File
@@ -5,12 +5,12 @@ import (
"hospital-admin-api/global"
)
type AdminMenuApi struct {
type AdminMenuApiDao struct {
}
// GetAdminMenuApiListByMenuID 获取菜单api-菜单id
// menuId 菜单id
func (r *AdminMenuApi) GetAdminMenuApiListByMenuID(menuId int64) (m []*model.AdminMenuApi, err error) {
func (r *AdminMenuApiDao) GetAdminMenuApiListByMenuID(menuId int64) (m []*model.AdminMenuApi, err error) {
err = global.Db.Where("menu_id = ?", menuId).Preload("API").Find(&m).Error
if err != nil {
return nil, err
api/dao/adminRole.go
+21 -2
View File
@@ -5,15 +5,34 @@ import (
"hospital-admin-api/global"
)
type AdminRole struct {
type AdminRoleDao struct {
}
// GetAdminRoleFirstById 角色id获取用户角色
// roleId 角色id
func (r *AdminRole) GetAdminRoleFirstById(roleId int64) (m model.AdminRole, err error) {
func (r *AdminRoleDao) GetAdminRoleFirstById(roleId int64) (m model.AdminRole, err error) {
err = global.Db.First(&m, roleId).Error
if err != nil {
return m, err
}
return m, nil
}
// GetAdminRolePageSearch 搜索角色列表-分页
func (r *AdminRoleDao) GetAdminRolePageSearch(roleName string, page, pageSize int) (m []model.AdminRole, err error) {
// 计算偏移量
offset := (page - 1) * pageSize
if roleName != "" {
err = global.Db.Where("role_name = ?", roleName).Offset(offset).Limit(pageSize).Find(&m).Error
if err != nil {
return m, err
}
} else {
err = global.Db.Offset(offset).Limit(pageSize).Find(&m).Error
if err != nil {
return m, err
}
}
return m, nil
}
api/dao/adminRoleMenu.go
+3 -3
View File
@@ -5,12 +5,12 @@ import (
"hospital-admin-api/global"
)
type AdminRoleMenu struct {
type AdminRoleMenuDao struct {
}
// GetAdminRoleMenuListByRoleId 获取角色菜单-角色id
// roleId 角色id
func (r *AdminRoleMenu) GetAdminRoleMenuListByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
func (r *AdminRoleMenuDao) GetAdminRoleMenuListByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
err = global.Db.Where("role_id = ?", roleId).Find(&m).Error
if err != nil {
return nil, err
@@ -19,7 +19,7 @@ func (r *AdminRoleMenu) GetAdminRoleMenuListByRoleId(roleId int64) (m []*model.A
}
// GetAdminRoleMenuListWithMenuByRoleId 获取角色菜单
func (r *AdminRoleMenu) GetAdminRoleMenuListWithMenuByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
func (r *AdminRoleMenuDao) GetAdminRoleMenuListWithMenuByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
err = global.Db.Where("role_id = ?", roleId).Preload("Menu").Find(&m).Error
if err != nil {
return nil, err
api/dao/adminUser.go
+3 -3
View File
@@ -5,12 +5,12 @@ import (
"hospital-admin-api/global"
)
type AdminUser struct {
type AdminUserDao struct {
}
// GetAdminUserFirstById 获取用户数据-用户id
// roleId 用户id
func (r *AdminUser) GetAdminUserFirstById(userId int64) (m model.AdminUser, err error) {
func (r *AdminUserDao) GetAdminUserFirstById(userId int64) (m model.AdminUser, err error) {
err = global.Db.First(&m, userId).Error
if err != nil {
return m, err
@@ -19,7 +19,7 @@ func (r *AdminUser) GetAdminUserFirstById(userId int64) (m model.AdminUser, err
}
// GetAdminUserFirstByAccess 获取用户数据-用户账号
func (r *AdminUser) GetAdminUserFirstByAccess(username string) (m model.AdminUser, err error) {
func (r *AdminUserDao) GetAdminUserFirstByAccess(username string) (m model.AdminUser, err error) {
err = global.Db.Where("access = ?", username).First(&m).Error
if err != nil {
return m, err