public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhangwenjian
2020-04-13 00:30:58 +08:00
parent f25da5f1ee
commit 1df55e75e5
72 changed files with 1401 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/role.go
+50 -68
View File
@@ -2,54 +2,44 @@ package models
import (
orm "go-admin/database"
"go-admin/utils"
"go-admin/pkg/utils"
)
type SysRole struct {
// 角色编码
Id int64 `json:"roleId" gorm:"column:role_id;primary_key"`
// 角色名称
Name string `json:"roleName" gorm:"column:role_name"`
RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码
RoleName string `json:"roleName" gorm:"type:varchar(128);"` // 角色名称
Status string `json:"status" gorm:"type:int(1);"` //
RoleKey string `json:"roleKey" gorm:"type:varchar(128);"` //角色代码
RoleSort int `json:"roleSort" gorm:"type:int(4);"` //角色排序
Flag string `json:"flag" gorm:"type:varchar(128);"` //
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` //
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` //
Remark string `json:"remark" gorm:"type:varchar(255);"` //备注
Admin bool `json:"admin" gorm:"type:char(1);"`
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
MenuIds []int `json:"menuIds" gorm:"-"`
DeptIds []int `json:"deptIds" gorm:"-"`
BaseModel
}
Status string `json:"status" gorm:"column:status"`
//角色代码
RoleKey string `json:"roleKey" gorm:"column:role_key"`
//角色排序
RoleSort int64 `json:"roleSort" gorm:"column:role_sort"`
Flag string `json:"flag" gorm:"column:flag"`
CreateBy string `gorm:"column:create_by" json:"createBy"`
CreateTime string `gorm:"column:create_time" json:"createTime"`
UpdateBy string `gorm:"column:update_by" json:"updateBy"`
UpdateTime string `gorm:"column:update_time" json:"updateTime"`
//备注
Remark string `gorm:"column:remark" json:"remark"`
Params string `gorm:"column:params" json:"params"`
DataScope string `gorm:"-" json:"dataScope"`
IsDel int `gorm:"column:is_del" json:"isDel"`
Admin bool `gorm:"column:admin" json:"admin"`
MenuIds []int64 `gorm:"-" json:"menuIds"`
DeptIds []int64 `gorm:"-" json:"deptIds"`
func (SysRole) TableName() string {
return "sys_role"
}
type MenuIdList struct {
MenuId int64 `json:"menuId"`
MenuId int `json:"menuId"`
}
func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error) {
func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) {
var doc []SysRole
table := orm.Eloquent.Select("*").Table("sys_role")
if e.Id != 0 {
table = table.Where("role_id = ?", e.Id)
if e.RoleId != 0 {
table = table.Where("role_id = ?", e.RoleId)
}
if e.Name != "" {
table = table.Where("role_name = ?", e.Name)
if e.RoleName != "" {
table = table.Where("role_name = ?", e.RoleName)
}
if e.Status != "" {
table = table.Where("status = ?", e.Status)
@@ -60,25 +50,25 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error)
// 数据权限控制
dataPermission := new(DataPermission)
dataPermission.UserId, _ = utils.StringToInt64(e.DataScope)
dataPermission.UserId, _ = utils.StringToInt(e.DataScope)
table = dataPermission.GetDataScope("sys_role", table)
var count int32
var count int
if err := table.Where("is_del = 0").Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("is_del = 0").Count(&count)
table.Count(&count)
return doc, count, nil
}
func (role *SysRole) Get() (SysRole SysRole, err error) {
table := orm.Eloquent.Table("sys_role")
if role.Id != 0 {
table = table.Where("role_id = ?", role.Id)
if role.RoleId != 0 {
table = table.Where("role_id = ?", role.RoleId)
}
if role.Name != "" {
table = table.Where("role_name = ?", role.Name)
if role.RoleName != "" {
table = table.Where("role_name = ?", role.RoleName)
}
if err = table.First(&SysRole).Error; err != nil {
return
@@ -88,12 +78,12 @@ func (role *SysRole) Get() (SysRole SysRole, err error) {
}
func (role *SysRole) GetList() (SysRole []SysRole, err error) {
table := orm.Eloquent.Table("sys_role").Where("is_del = 0")
if role.Id != 0 {
table = table.Where("role_id = ?", role.Id)
table := orm.Eloquent.Table("sys_role")
if role.RoleId != 0 {
table = table.Where("role_id = ?", role.RoleId)
}
if role.Name != "" {
table = table.Where("role_name = ?", role.Name)
if role.RoleName != "" {
table = table.Where("role_name = ?", role.RoleName)
}
if err = table.Order("role_sort").Find(&SysRole).Error; err != nil {
return
@@ -102,10 +92,10 @@ func (role *SysRole) GetList() (SysRole []SysRole, err error) {
return
}
func (role *SysRole) GetRoleMeunId() ([]int64, error) {
menuIds := make([]int64, 0)
func (role *SysRole) GetRoleMeunId() ([]int, error) {
menuIds := make([]int, 0)
menuList := make([]MenuIdList, 0)
if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id").Where("role_id = ? ", role.Id).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? )", role.Id).Find(&menuList).Error; err != nil {
if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? )", role.RoleId).Find(&menuList).Error; err != nil {
return nil, err
}
@@ -115,28 +105,25 @@ func (role *SysRole) GetRoleMeunId() ([]int64, error) {
return menuIds, nil
}
func (role *SysRole) Insert() (id int64, err error) {
role.CreateTime = utils.GetCurrntTime()
func (role *SysRole) Insert() (id int, err error) {
role.UpdateBy = ""
role.UpdateTime = utils.GetCurrntTime()
role.IsDel = 0
result := orm.Eloquent.Table("sys_role").Create(&role)
if result.Error != nil {
err = result.Error
return
}
id = role.Id
id = role.RoleId
return
}
type DeptIdList struct {
DeptId int64 `json:"DeptId"`
DeptId int `json:"DeptId"`
}
func (role *SysRole) GetRoleDeptId() ([]int64, error) {
deptIds := make([]int64, 0)
func (role *SysRole) GetRoleDeptId() ([]int, error) {
deptIds := make([]int, 0)
deptList := make([]DeptIdList, 0)
if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.Id).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.Id).Order("role_sort").Find(&deptList).Error; err != nil {
if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.RoleId).Find(&deptList).Error; err != nil {
return nil, err
}
@@ -148,8 +135,7 @@ func (role *SysRole) GetRoleDeptId() ([]int64, error) {
}
//修改
func (role *SysRole) Update(id int64) (update SysRole, err error) {
role.UpdateTime = utils.GetCurrntTime()
func (role *SysRole) Update(id int) (update SysRole, err error) {
if err = orm.Eloquent.Table("sys_role").First(&update, id).Error; err != nil {
return
}
@@ -163,12 +149,8 @@ func (role *SysRole) Update(id int64) (update SysRole, err error) {
}
//批量删除
func (e *SysRole) BatchDelete(id []int64) (Result bool, err error) {
var mp = map[string]string{}
mp["is_del"] = "1"
mp["update_time"] = utils.GetCurrntTime()
mp["update_by"] = e.UpdateBy
if err = orm.Eloquent.Table("sys_role").Where("is_del=0 and role_id in (?)", id).Update(mp).Error; err != nil {
func (e *SysRole) BatchDelete(id []int) (Result bool, err error) {
if err = orm.Eloquent.Table("sys_role").Where("role_id in (?)", id).Delete(&SysRole{}).Error; err != nil {
return
}
Result = true