新增部门接口
This commit is contained in:
parent
188a8f0d02
commit
002353cc30
@ -2,8 +2,14 @@ package controller
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"hospital-admin-api/api/dao"
|
||||||
|
"hospital-admin-api/api/requests"
|
||||||
"hospital-admin-api/api/responses"
|
"hospital-admin-api/api/responses"
|
||||||
|
"hospital-admin-api/api/responses/deptResponse"
|
||||||
"hospital-admin-api/api/service"
|
"hospital-admin-api/api/service"
|
||||||
|
"hospital-admin-api/global"
|
||||||
|
"hospital-admin-api/utils"
|
||||||
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Dept struct{}
|
type Dept struct{}
|
||||||
@ -27,116 +33,154 @@ func (r *Dept) GetDeptList(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// AddDept 新增部门
|
// AddDept 新增部门
|
||||||
// func (r *Dept) AddDept(c *gin.Context) {
|
func (r *Dept) AddDept(c *gin.Context) {
|
||||||
// deptRequest := requests.DeptRequest{}
|
deptRequest := requests.DeptRequest{}
|
||||||
// if err := c.ShouldBind(&deptRequest.AddDept); err != nil {
|
if err := c.ShouldBind(&deptRequest.AddDept); err != nil {
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
responses.FailWithMessage(err.Error(), c)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 参数验证
|
|
||||||
// if err := global.Validate.Struct(deptRequest.AddDept); err != nil {
|
|
||||||
// responses.FailWithMessage(utils.Translate(err), c)
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // 业务处理
|
|
||||||
// deptService := service.DeptService{}
|
|
||||||
// _, err := deptService.AddDept(deptRequest.AddDept)
|
|
||||||
// if err != nil {
|
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// responses.Ok(c)
|
|
||||||
// }
|
|
||||||
|
|
||||||
//
|
// 参数验证
|
||||||
// // GetDept 部门详情
|
if err := global.Validate.Struct(deptRequest.AddDept); err != nil {
|
||||||
// func (r *Dept) GetDept(c *gin.Context) {
|
responses.FailWithMessage(utils.Translate(err), c)
|
||||||
// id := c.Param("dept_id")
|
return
|
||||||
// if id == "" {
|
}
|
||||||
// responses.FailWithMessage("缺少参数", c)
|
|
||||||
// return
|
// 获取角色身份
|
||||||
// }
|
roleService := service.RoleService{}
|
||||||
//
|
isAdmin, err := roleService.GetRoleIden(c)
|
||||||
// // 将 id 转换为 int64 类型
|
if err != nil {
|
||||||
// deptId, err := strconv.ParseInt(id, 10, 64)
|
responses.FailWithMessage(err.Error(), c)
|
||||||
// if err != nil {
|
return
|
||||||
// responses.Fail(c)
|
}
|
||||||
// return
|
|
||||||
// }
|
if !isAdmin {
|
||||||
//
|
responses.FailWithMessage("非管理员,无法添加部门", c)
|
||||||
// // 获取部门详情
|
return
|
||||||
// adminDeptDao := dao.AdminDeptDao{}
|
}
|
||||||
// adminDept, err := adminDeptDao.GetAdminDeptById(deptId)
|
|
||||||
// if err != nil || adminDept == nil {
|
// 业务处理
|
||||||
// responses.FailWithMessage("部门数据错误", c)
|
deptService := service.DeptService{}
|
||||||
// return
|
_, err = deptService.AddDept(deptRequest.AddDept)
|
||||||
// }
|
if err != nil {
|
||||||
//
|
responses.FailWithMessage(err.Error(), c)
|
||||||
// // 处理返回值
|
return
|
||||||
// getDeptResponses := apiResponse.GetDeptResponse(adminDept)
|
}
|
||||||
//
|
responses.Ok(c)
|
||||||
// responses.OkWithData(getDeptResponses, c)
|
}
|
||||||
// }
|
|
||||||
//
|
// GetDept 部门详情
|
||||||
// // DeleteDept 删除部门-批量
|
func (r *Dept) GetDept(c *gin.Context) {
|
||||||
// func (r *Dept) DeleteDept(c *gin.Context) {
|
id := c.Param("dept_id")
|
||||||
// deptRequest := requests.DeptRequest{}
|
if id == "" {
|
||||||
// if err := c.ShouldBindJSON(&deptRequest.DeleteDept); err != nil {
|
responses.FailWithMessage("缺少参数", c)
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
return
|
||||||
// return
|
}
|
||||||
// }
|
|
||||||
//
|
// 将 id 转换为 int64 类型
|
||||||
// // 参数验证
|
deptId, err := strconv.ParseInt(id, 10, 64)
|
||||||
// if err := global.Validate.Struct(deptRequest.DeleteDept); err != nil {
|
if err != nil {
|
||||||
// responses.FailWithMessage(utils.Translate(err), c)
|
responses.Fail(c)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 业务处理
|
// 获取部门详情
|
||||||
// apiService := service.DeptService{}
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
// _, err := apiService.DeleteDept(c, deptRequest.DeleteDept)
|
adminDept, err := adminDeptDao.GetAdminDeptById(deptId)
|
||||||
// if err != nil {
|
if err != nil || adminDept == nil {
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
responses.FailWithMessage("部门数据错误", c)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
// responses.Ok(c)
|
|
||||||
// }
|
// 处理返回值
|
||||||
//
|
getDeptResponses := deptResponse.GetDeptResponse(adminDept)
|
||||||
// // PutDept 修改部门
|
|
||||||
// func (r *Dept) PutDept(c *gin.Context) {
|
responses.OkWithData(getDeptResponses, c)
|
||||||
// deptRequest := requests.DeptRequest{}
|
}
|
||||||
// if err := c.ShouldBind(&deptRequest.PutDept); err != nil {
|
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
// DeleteDept 删除部门-批量
|
||||||
// return
|
func (r *Dept) DeleteDept(c *gin.Context) {
|
||||||
// }
|
deptRequest := requests.DeptRequest{}
|
||||||
//
|
if err := c.ShouldBindJSON(&deptRequest.DeleteDept); err != nil {
|
||||||
// // 参数验证
|
responses.FailWithMessage(err.Error(), c)
|
||||||
// if err := global.Validate.Struct(deptRequest.PutDept); err != nil {
|
return
|
||||||
// responses.FailWithMessage(utils.Translate(err), c)
|
}
|
||||||
// return
|
|
||||||
// }
|
// 参数验证
|
||||||
//
|
if err := global.Validate.Struct(deptRequest.DeleteDept); err != nil {
|
||||||
// id := c.Param("dept_id")
|
responses.FailWithMessage(utils.Translate(err), c)
|
||||||
// if id == "" {
|
return
|
||||||
// responses.FailWithMessage("缺少参数", c)
|
}
|
||||||
// return
|
|
||||||
// }
|
// 获取角色身份
|
||||||
//
|
roleService := service.RoleService{}
|
||||||
// // 将 id 转换为 int64 类型
|
isAdmin, err := roleService.GetRoleIden(c)
|
||||||
// deptId, err := strconv.ParseInt(id, 10, 64)
|
if err != nil {
|
||||||
// if err != nil {
|
responses.FailWithMessage(err.Error(), c)
|
||||||
// responses.Fail(c)
|
return
|
||||||
// return
|
}
|
||||||
// }
|
|
||||||
//
|
if !isAdmin {
|
||||||
// // 业务处理
|
responses.FailWithMessage("非管理员,无法添加部门", c)
|
||||||
// apiService := service.DeptService{}
|
return
|
||||||
// _, err = apiService.PutDept(c, deptId, deptRequest.PutDept)
|
}
|
||||||
// if err != nil {
|
|
||||||
// responses.FailWithMessage(err.Error(), c)
|
// 业务处理
|
||||||
// return
|
apiService := service.DeptService{}
|
||||||
// }
|
_, err = apiService.DeleteDept(deptRequest.DeleteDept)
|
||||||
// responses.Ok(c)
|
if err != nil {
|
||||||
// }
|
responses.FailWithMessage(err.Error(), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
responses.Ok(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PutDept 修改部门
|
||||||
|
func (r *Dept) PutDept(c *gin.Context) {
|
||||||
|
deptRequest := requests.DeptRequest{}
|
||||||
|
if err := c.ShouldBind(&deptRequest.PutDept); err != nil {
|
||||||
|
responses.FailWithMessage(err.Error(), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 参数验证
|
||||||
|
if err := global.Validate.Struct(deptRequest.PutDept); err != nil {
|
||||||
|
responses.FailWithMessage(utils.Translate(err), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
id := c.Param("dept_id")
|
||||||
|
if id == "" {
|
||||||
|
responses.FailWithMessage("缺少参数", c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 将 id 转换为 int64 类型
|
||||||
|
deptId, err := strconv.ParseInt(id, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
responses.Fail(c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取角色身份
|
||||||
|
roleService := service.RoleService{}
|
||||||
|
isAdmin, err := roleService.GetRoleIden(c)
|
||||||
|
if err != nil {
|
||||||
|
responses.FailWithMessage(err.Error(), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isAdmin {
|
||||||
|
responses.FailWithMessage("非管理员,无法添加部门", c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 业务处理
|
||||||
|
apiService := service.DeptService{}
|
||||||
|
_, err = apiService.PutDept(deptId, deptRequest.PutDept)
|
||||||
|
if err != nil {
|
||||||
|
responses.FailWithMessage(err.Error(), c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
responses.Ok(c)
|
||||||
|
}
|
||||||
|
|||||||
@ -19,18 +19,35 @@ func (r *AdminDeptDao) GetAdminDeptById(deptId int64) (m *model.AdminDept, err e
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GetAdminDeptList 获取部门列表
|
// GetAdminDeptList 获取部门列表
|
||||||
func (r *AdminDeptDao) GetAdminDeptList() (m []*model.AdminDept, err error) {
|
func (r *AdminDeptDao) GetAdminDeptList(maps interface{}) (m []*model.AdminDept, err error) {
|
||||||
err = global.Db.Find(&m).Error
|
err = global.Db.Where(maps).Find(&m).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return m, nil
|
return m, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddAdminDept 新增接口
|
// AddAdminDept 新增部门
|
||||||
func (r *AdminApiDao) AddAdminDept(tx *gorm.DB, model *model.AdminAPI) (*model.AdminAPI, error) {
|
func (r *AdminDeptDao) AddAdminDept(tx *gorm.DB, model *model.AdminDept) (*model.AdminDept, error) {
|
||||||
if err := tx.Create(model).Error; err != nil {
|
if err := tx.Create(model).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return model, nil
|
return model, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteAdminDeptById 删除部门-部门id
|
||||||
|
func (r *AdminDeptDao) DeleteAdminDeptById(tx *gorm.DB, deptId int64) error {
|
||||||
|
if err := tx.Delete(&model.AdminDept{}, deptId).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EditAdminDeptById 修改部门-部门id
|
||||||
|
func (r *AdminDeptDao) EditAdminDeptById(tx *gorm.DB, deptId int64, data interface{}) error {
|
||||||
|
err := tx.Model(&model.AdminDept{}).Where("dept_id = ?", deptId).Updates(data).Error
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@ -30,8 +30,8 @@ func Auth() gin.HandlerFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取用户数据
|
// 获取用户数据
|
||||||
AdminUserDao := dao.AdminUserDao{}
|
adminUserDao := dao.AdminUserDao{}
|
||||||
adminUser, err := AdminUserDao.GetAdminUserFirstById(userId)
|
adminUser, err := adminUserDao.GetAdminUserFirstById(userId)
|
||||||
if err != nil || adminUser == nil {
|
if err != nil || adminUser == nil {
|
||||||
responses.FailWithMessage("用户数据错误", c)
|
responses.FailWithMessage("用户数据错误", c)
|
||||||
c.Abort()
|
c.Abort()
|
||||||
@ -78,6 +78,23 @@ func Auth() gin.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取用户部门数据
|
||||||
|
if adminUser.PostID != 0 {
|
||||||
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
|
adminDept, err := adminDeptDao.GetAdminDeptById(adminUser.PostID)
|
||||||
|
if err != nil || adminDept == nil {
|
||||||
|
responses.FailWithMessage("用户部门数据错误", c)
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if adminDept.DeptStatus == 2 {
|
||||||
|
responses.FailWithMessage("您所在的部门已被删除,请联系管理员修改", c)
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 获取角色菜单id
|
// 获取角色菜单id
|
||||||
AdminRoleMenuDao := dao.AdminRoleMenuDao{}
|
AdminRoleMenuDao := dao.AdminRoleMenuDao{}
|
||||||
adminRoleMenu, _ := AdminRoleMenuDao.GetAdminRoleMenuListByRoleId(roleId)
|
adminRoleMenu, _ := AdminRoleMenuDao.GetAdminRoleMenuListByRoleId(roleId)
|
||||||
@ -94,9 +111,9 @@ func Auth() gin.HandlerFunc {
|
|||||||
var apiPermissions = make(map[string]bool)
|
var apiPermissions = make(map[string]bool)
|
||||||
|
|
||||||
// 获取菜单对应api
|
// 获取菜单对应api
|
||||||
AdminMenuApiDao := dao.AdminMenuApiDao{}
|
adminMenuApiDao := dao.AdminMenuApiDao{}
|
||||||
for _, v := range adminRoleMenu {
|
for _, v := range adminRoleMenu {
|
||||||
AdminMenuApi, _ := AdminMenuApiDao.GetAdminMenuApiListByMenuID(v.MenuID)
|
AdminMenuApi, _ := adminMenuApiDao.GetAdminMenuApiListByMenuID(v.MenuID)
|
||||||
if AdminMenuApi == nil {
|
if AdminMenuApi == nil {
|
||||||
// 菜单无需权限
|
// 菜单无需权限
|
||||||
c.Next()
|
c.Next()
|
||||||
|
|||||||
@ -10,7 +10,6 @@ type DeptRequest struct {
|
|||||||
type AddDept struct {
|
type AddDept struct {
|
||||||
ParentId string `json:"parent_id" form:"parent_id" validate:"required" label:"上级部门"` // 本表父级id
|
ParentId string `json:"parent_id" form:"parent_id" validate:"required" label:"上级部门"` // 本表父级id
|
||||||
DeptName string `json:"dept_name" form:"dept_name" validate:"required" label:"部门名称"`
|
DeptName string `json:"dept_name" form:"dept_name" validate:"required" label:"部门名称"`
|
||||||
DeptStatus int `json:"dept_status" form:"dept_status" validate:"required,oneof=1 2" label:"部门状态"` // (1:正常 2:删除)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteDept 删除部门-批量
|
// DeleteDept 删除部门-批量
|
||||||
@ -20,7 +19,7 @@ type DeleteDept struct {
|
|||||||
|
|
||||||
// PutDept 修改部门
|
// PutDept 修改部门
|
||||||
type PutDept struct {
|
type PutDept struct {
|
||||||
ParentId int64 `json:"parent_id" form:"parent_id" validate:"required" label:"上级部门"` // 本表父级id
|
ParentId string `json:"parent_id" form:"parent_id" validate:"required" label:"上级部门"` // 本表父级id
|
||||||
DeptName string `json:"dept_name" form:"dept_name" validate:"required" label:"部门名称"`
|
DeptName string `json:"dept_name" form:"dept_name" validate:"required" label:"部门名称"`
|
||||||
DeptStatus int `json:"dept_status" form:"dept_status" validate:"required,oneof=1 2" label:"部门状态"` // (1:正常 2:删除)
|
DeptStatus int `json:"dept_status" form:"dept_status" validate:"required,oneof=1 2" label:"部门状态"` // (1:正常 2:删除)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
package deptResponse
|
package deptResponse
|
||||||
|
|
||||||
import "hospital-admin-api/api/model"
|
import (
|
||||||
|
"hospital-admin-api/api/model"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
// GetDeptList 获取部门列表
|
// GetDeptList 获取部门列表
|
||||||
type GetDeptList struct {
|
type GetDeptList struct {
|
||||||
@ -12,3 +15,25 @@ type GetDeptList struct {
|
|||||||
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
|
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
|
||||||
Children []*GetDeptList `json:"children"` // 下级页面
|
Children []*GetDeptList `json:"children"` // 下级页面
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetDept 部门详情
|
||||||
|
type getDept struct {
|
||||||
|
DeptId string `json:"dept_id"`
|
||||||
|
ParentId string `json:"parent_id"` // 父菜单ID(0表示一级)
|
||||||
|
DeptName string `json:"dept_name"` // 部门名称
|
||||||
|
DeptStatus int `json:"dept_status"` // 部门状态(1:正常 2:删除)
|
||||||
|
CreatedAt model.LocalTime `json:"created_at"` // 创建时间
|
||||||
|
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDeptResponse 部门详情
|
||||||
|
func GetDeptResponse(adminDept *model.AdminDept) *getDept {
|
||||||
|
return &getDept{
|
||||||
|
DeptId: strconv.Itoa(int(adminDept.DeptId)),
|
||||||
|
ParentId: strconv.Itoa(int(adminDept.ParentId)),
|
||||||
|
DeptName: adminDept.DeptName,
|
||||||
|
DeptStatus: adminDept.DeptStatus,
|
||||||
|
CreatedAt: adminDept.CreatedAt,
|
||||||
|
UpdatedAt: adminDept.UpdatedAt,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -158,15 +158,15 @@ func privateRouter(r *gin.Engine, api controller.Api) {
|
|||||||
deptGroup.GET("", api.Dept.GetDeptList)
|
deptGroup.GET("", api.Dept.GetDeptList)
|
||||||
|
|
||||||
// 新增部门
|
// 新增部门
|
||||||
deptGroup.POST("", api.Dept.GetDeptList)
|
deptGroup.POST("", api.Dept.AddDept)
|
||||||
|
|
||||||
// 部门详情
|
// 部门详情
|
||||||
deptGroup.GET("/:api_id", api.Dept.GetDeptList)
|
deptGroup.GET("/:dept_id", api.Dept.GetDept)
|
||||||
|
|
||||||
// 删除部门-批量
|
// 删除部门-批量
|
||||||
deptGroup.DELETE("", api.Dept.GetDeptList)
|
deptGroup.DELETE("", api.Dept.DeleteDept)
|
||||||
|
|
||||||
// 修改部门
|
// 修改部门
|
||||||
deptGroup.PUT("/:api_id", api.Dept.GetDeptList)
|
deptGroup.PUT("/:dept_id", api.Dept.PutDept)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -110,6 +110,7 @@ func (r *ApiService) DeleteApi(c *gin.Context, deleteApiRequest requests.DeleteA
|
|||||||
// 将字符串转换为int64类型
|
// 将字符串转换为int64类型
|
||||||
v, err := strconv.ParseInt(v, 10, 64)
|
v, err := strconv.ParseInt(v, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
return false, errors.New("菜单错误")
|
return false, errors.New("菜单错误")
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -189,7 +190,7 @@ func (r *ApiService) PutApi(c *gin.Context, requestApiId int64, putApiRequest re
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// 修改角色
|
// 修改接口
|
||||||
data := make(map[string]interface{})
|
data := make(map[string]interface{})
|
||||||
data["api_name"] = putApiRequest.ApiName
|
data["api_name"] = putApiRequest.ApiName
|
||||||
data["api_path"] = putApiRequest.ApiPath
|
data["api_path"] = putApiRequest.ApiPath
|
||||||
|
|||||||
@ -1,8 +1,12 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"hospital-admin-api/api/dao"
|
"hospital-admin-api/api/dao"
|
||||||
|
"hospital-admin-api/api/model"
|
||||||
|
"hospital-admin-api/api/requests"
|
||||||
"hospital-admin-api/api/responses/deptResponse"
|
"hospital-admin-api/api/responses/deptResponse"
|
||||||
|
"hospital-admin-api/global"
|
||||||
"strconv"
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -13,7 +17,10 @@ type DeptService struct {
|
|||||||
func (r *DeptService) GetDeptList() ([]*deptResponse.GetDeptList, error) {
|
func (r *DeptService) GetDeptList() ([]*deptResponse.GetDeptList, error) {
|
||||||
// 获取全部部门
|
// 获取全部部门
|
||||||
adminDeptDao := dao.AdminDeptDao{}
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
adminDept, _ := adminDeptDao.GetAdminDeptList()
|
|
||||||
|
maps := make(map[string]interface{})
|
||||||
|
maps["dept_status"] = 1
|
||||||
|
adminDept, _ := adminDeptDao.GetAdminDeptList(maps)
|
||||||
if adminDept == nil {
|
if adminDept == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@ -50,81 +57,133 @@ func (r *DeptService) GetDeptList() ([]*deptResponse.GetDeptList, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// AddDept 新增部门
|
// AddDept 新增部门
|
||||||
// func (r *DeptService) AddDept(addDeptRequest requests.AddDept) (bool, error) {
|
func (r *DeptService) AddDept(addDeptRequest requests.AddDept) (bool, error) {
|
||||||
// adminDeptDao := dao.AdminDeptDao{}
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
//
|
|
||||||
// parentId, err := strconv.ParseInt(addDeptRequest.ParentId, 10, 64)
|
parentId, err := strconv.ParseInt(addDeptRequest.ParentId, 10, 64)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return false, errors.New("新增失败")
|
return false, errors.New("新增失败")
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 判断父级id
|
// 判断父级id
|
||||||
// if parentId != 0 {
|
if parentId != 0 {
|
||||||
// adminDept, _ := adminDeptDao.GetAdminDeptById(parentId)
|
adminDept, _ := adminDeptDao.GetAdminDeptById(parentId)
|
||||||
// if adminDept == nil {
|
if adminDept == nil {
|
||||||
// return false, errors.New("上级部门错误")
|
return false, errors.New("上级部门错误")
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 开始事务
|
// 开始事务
|
||||||
// tx := global.Db.Begin()
|
tx := global.Db.Begin()
|
||||||
// defer func() {
|
defer func() {
|
||||||
// if r := recover(); r != nil {
|
if r := recover(); r != nil {
|
||||||
// tx.Rollback()
|
tx.Rollback()
|
||||||
// }
|
}
|
||||||
// }()
|
}()
|
||||||
//
|
|
||||||
// // 新增菜单
|
// 新增菜单
|
||||||
// AdminMenuModel := &model.AdminMenu{
|
adminDeptModel := &model.AdminDept{
|
||||||
// MenuName: AddMenuRequest.MenuName,
|
ParentId: parentId,
|
||||||
// MenuTitle: AddMenuRequest.MenuTitle,
|
DeptName: addDeptRequest.DeptName,
|
||||||
// ParentId: ParentId,
|
DeptStatus: 1,
|
||||||
// MenuStatus: AddMenuRequest.MenuStatus,
|
}
|
||||||
// MenuType: AddMenuRequest.MenuType,
|
|
||||||
// Permission: AddMenuRequest.Permission,
|
adminMenu, _ := adminDeptDao.AddAdminDept(tx, adminDeptModel)
|
||||||
// OrderNum: AddMenuRequest.OrderNum,
|
if adminMenu == nil {
|
||||||
// Icon: AddMenuRequest.Icon,
|
tx.Rollback()
|
||||||
// Path: AddMenuRequest.Path,
|
return false, errors.New("新增失败")
|
||||||
// Component: AddMenuRequest.Component,
|
}
|
||||||
// }
|
|
||||||
//
|
tx.Commit()
|
||||||
// adminMenu, _ := AdminMenuDao.AddAdminMenu(tx, AdminMenuModel)
|
|
||||||
// if adminMenu == nil {
|
return true, nil
|
||||||
// tx.Rollback()
|
}
|
||||||
// return false, errors.New("新增失败")
|
|
||||||
// }
|
// DeleteDept 删除部门-批量
|
||||||
//
|
func (r *DeptService) DeleteDept(deleteDeptRequest requests.DeleteDept) (bool, error) {
|
||||||
// // 新增菜单api
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
// if len(AddMenuRequest.ApiIds) > 0 {
|
|
||||||
// for _, v := range AddMenuRequest.ApiIds {
|
// 开始事务
|
||||||
// // 将字符串转换为int64类型
|
tx := global.Db.Begin()
|
||||||
// v, err := strconv.ParseInt(v, 10, 64)
|
defer func() {
|
||||||
// if err != nil {
|
if r := recover(); r != nil {
|
||||||
// tx.Rollback()
|
tx.Rollback()
|
||||||
// return false, errors.New("新增失败")
|
}
|
||||||
// }
|
}()
|
||||||
//
|
|
||||||
// // 检测api
|
for _, v := range deleteDeptRequest.DeptIds {
|
||||||
// adminApi, _ := AdminApiDao.GetAdminApiById(v)
|
// 将字符串转换为int64类型
|
||||||
// if adminApi == nil {
|
v, err := strconv.ParseInt(v, 10, 64)
|
||||||
// tx.Rollback()
|
if err != nil {
|
||||||
// return false, errors.New("接口不存在")
|
tx.Rollback()
|
||||||
// }
|
return false, errors.New("菜单错误")
|
||||||
//
|
}
|
||||||
// AdminMenuApiModel := &model.AdminMenuApi{
|
|
||||||
// MenuId: adminMenu.MenuId,
|
// 检测删除部门
|
||||||
// ApiId: v,
|
adminDept, err := adminDeptDao.GetAdminDeptById(v)
|
||||||
// }
|
if err != nil || adminDept == nil {
|
||||||
//
|
tx.Rollback()
|
||||||
// adminMenuApi, _ := AdminMenuApiDao.AddAdminMenuApi(tx, AdminMenuApiModel)
|
return false, errors.New("删除失败")
|
||||||
// if adminMenuApi == nil {
|
}
|
||||||
// tx.Rollback()
|
|
||||||
// return false, errors.New("新增失败")
|
// 修改部门为删除
|
||||||
// }
|
data := make(map[string]interface{})
|
||||||
// }
|
data["dept_status"] = 2
|
||||||
// }
|
err = adminDeptDao.EditAdminDeptById(tx, v, data)
|
||||||
//
|
if err != nil {
|
||||||
// tx.Commit()
|
tx.Rollback()
|
||||||
//
|
return false, errors.New("删除失败")
|
||||||
// return true, nil
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
|
tx.Commit()
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PutDept 修改部门
|
||||||
|
func (r *DeptService) PutDept(requestDeptId int64, putDeptRequest requests.PutDept) (bool, error) {
|
||||||
|
adminDeptDao := dao.AdminDeptDao{}
|
||||||
|
|
||||||
|
// 获取需修改部门数据
|
||||||
|
adminDept, err := adminDeptDao.GetAdminDeptById(requestDeptId)
|
||||||
|
if err != nil || adminDept == nil {
|
||||||
|
return false, errors.New("部门数据错误")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断父级id
|
||||||
|
parentId, err := strconv.ParseInt(putDeptRequest.ParentId, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return false, errors.New("新增失败")
|
||||||
|
}
|
||||||
|
|
||||||
|
if parentId != 0 {
|
||||||
|
adminDept, _ := adminDeptDao.GetAdminDeptById(parentId)
|
||||||
|
if adminDept == nil {
|
||||||
|
return false, errors.New("上级部门错误")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 开始事务
|
||||||
|
tx := global.Db.Begin()
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// 修改部门
|
||||||
|
data := make(map[string]interface{})
|
||||||
|
data["parent_id"] = parentId
|
||||||
|
data["dept_name"] = putDeptRequest.DeptName
|
||||||
|
data["dept_status"] = putDeptRequest.DeptStatus
|
||||||
|
err = adminDeptDao.EditAdminDeptById(tx, requestDeptId, data)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return false, errors.New("修改失败")
|
||||||
|
}
|
||||||
|
|
||||||
|
tx.Commit()
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|||||||
@ -40,17 +40,17 @@ func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleRespon
|
|||||||
return []*roleResponse.GetRoleMenuList{}, nil
|
return []*roleResponse.GetRoleMenuList{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var menuTree []*roleResponse.GetRoleMenuList
|
var getRoleMenuListResponse []*roleResponse.GetRoleMenuList
|
||||||
|
|
||||||
if len(menuIDs) > 0 {
|
if len(menuIDs) > 0 {
|
||||||
// 构建菜单树
|
// 构建菜单树
|
||||||
menuTree = buildMenuTree(menuIDs, adminMenu)
|
getRoleMenuListResponse = buildMenuTree(menuIDs, adminMenu)
|
||||||
if menuTree == nil {
|
if getRoleMenuListResponse == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return menuTree, nil
|
return getRoleMenuListResponse, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取角色菜单-构建菜单树
|
// 获取角色菜单-构建菜单树
|
||||||
@ -359,9 +359,9 @@ func (r *RoleService) DeleteRole(c *gin.Context, DeleteRoleRequest requests.Dele
|
|||||||
// 获取绑定该角色的用户
|
// 获取绑定该角色的用户
|
||||||
maps := make(map[string]interface{})
|
maps := make(map[string]interface{})
|
||||||
maps["role_id"] = v
|
maps["role_id"] = v
|
||||||
AdminUser, err := AdminUserDao.GetAdminUserList(maps)
|
adminUser, err := AdminUserDao.GetAdminUserList(maps)
|
||||||
if AdminUser != nil {
|
if adminUser != nil {
|
||||||
for _, user := range AdminUser {
|
for _, user := range adminUser {
|
||||||
// 修改对应用户角色id为0
|
// 修改对应用户角色id为0
|
||||||
data := make(map[string]interface{})
|
data := make(map[string]interface{})
|
||||||
data["role_id"] = nil
|
data["role_id"] = nil
|
||||||
|
|||||||
@ -175,6 +175,7 @@ func (r *UserService) DeleteUser(c *gin.Context, DeleteUserRequest requests.Dele
|
|||||||
// 将字符串转换为int64类型
|
// 将字符串转换为int64类型
|
||||||
v, err := strconv.ParseInt(v, 10, 64)
|
v, err := strconv.ParseInt(v, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
return false, errors.New("菜单错误")
|
return false, errors.New("菜单错误")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user