新增菜单，修改角色，分页

api/dao/adminApi.go

@@ -0,0 +1,18 @@
+package dao
+
+import (
+	"hospital-admin-api/api/model"
+	"hospital-admin-api/global"
+)
+
+type AdminApiDao struct {
+}
+
+// GetAdminApiById 获取菜单数据-菜单id
+func (r *AdminApiDao) GetAdminApiById(apiId int64) (m *model.AdminAPI, err error) {
+	err = global.Db.First(&m, apiId).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}

api/dao/adminMenu.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"gorm.io/gorm"
 	"hospital-admin-api/api/model"
 	"hospital-admin-api/global"
 )
@@ -34,3 +35,20 @@ func (r *AdminMenuDao) GetAdminMenuById(menuId int64) (m *model.AdminMenu, err e
 	}
 	return m, nil
 }
+
+// GetAdminMenuListNormalSortOrderNum 获取全部正常菜单列表-排序
+func (r *AdminMenuDao) GetAdminMenuListNormalSortOrderNum() (m []*model.AdminMenu, err error) {
+	err = global.Db.Where("menu_status = ?", 1).Order("order_num asc").Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// AddAdminMenu 新增菜单
+func (r *AdminMenuDao) AddAdminMenu(tx *gorm.DB, model *model.AdminMenu) (*model.AdminMenu, error) {
+	if err := tx.Create(model).Error; err != nil {
+		return nil, err
+	}
+	return model, nil
+}

api/dao/adminMenuApi.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"gorm.io/gorm"
 	"hospital-admin-api/api/model"
 	"hospital-admin-api/global"
 )
@@ -17,3 +18,11 @@ func (r *AdminMenuApiDao) GetAdminMenuApiListByMenuID(menuId int64) (m []*model.
 	}
 	return m, nil
 }
+
+// AddAdminMenuApi 新增菜单api
+func (r *AdminMenuApiDao) AddAdminMenuApi(tx *gorm.DB, model *model.AdminMenuApi) (*model.AdminMenuApi, error) {
+	if err := tx.Create(model).Error; err != nil {
+		return nil, err
+	}
+	return model, nil
+}

api/dao/adminRole.go

@@ -19,25 +19,6 @@ func (r *AdminRoleDao) GetAdminRoleFirstById(roleId int64) (m *model.AdminRole,
 	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 nil, err
-		}
-	} else {
-		err = global.Db.Offset(offset).Limit(pageSize).Find(&m).Error
-		if err != nil {
-			return nil, err
-		}
-	}
-	return m, nil
-}
-
 // EditAdminRoleStatusById 角色启用/禁用-角色id
 func (r *AdminRoleDao) EditAdminRoleStatusById(roleId int64, roleStatus int) error {
 	err := global.Db.Model(&model.AdminRole{}).Where("role_id = ?", roleId).Update("role_status", roleStatus).Error
@@ -54,3 +35,34 @@ func (r *AdminRoleDao) AddAdminRole(tx *gorm.DB, model *model.AdminRole) (*model
 	}
 	return model, nil
 }
+
+// GetAdminRolePageSearch 搜索角色列表-分页
+func (r *AdminRoleDao) GetAdminRolePageSearch(roleName string, page, pageSize int) (m []*model.AdminRole, total int64, err error) {
+	var totalRecords int64
+
+	// 构建查询条件
+	query := global.Db.Model(&model.AdminRole{})
+	if roleName != "" {
+		query = query.Where("role_name = ?", roleName)
+	}
+
+	// 查询总数量
+	if err := query.Count(&totalRecords).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err = query.Scopes(model.Paginate(page, pageSize)).Find(&m).Error
+	if err != nil {
+		return nil, 0, err
+	}
+	return m, totalRecords, nil
+}
+
+// EditAdminRoleById 修改角色
+func (r *AdminRoleDao) EditAdminRoleById(tx *gorm.DB, roleId int64, data interface{}) error {
+	err := tx.Model(&model.AdminRole{}).Where("role_id = ?", roleId).Updates(data).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}

api/dao/adminRoleMenu.go

@@ -48,3 +48,11 @@ func (r *AdminRoleMenuDao) AddAdminRoleMenu(tx *gorm.DB, model *model.AdminRoleM
 	}
 	return model, nil
 }
+
+// DeleteAdminRoleMenuByRoleId 删除角色菜单
+func (r *AdminRoleMenuDao) DeleteAdminRoleMenuByRoleId(tx *gorm.DB, roleId int64) error {
+	if err := tx.Where("role_id = ?", roleId).Delete(&model.AdminRoleMenu{}).Error; err != nil {
+		return err
+	}
+	return nil
+}