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

refactor🎨: request name cancel

Browse Source
This commit is contained in:
zhangwenjian
2021-07-14 09:14:44 +08:00
parent 32a1bd2511
commit dd22d55ee7
34 changed files with 239 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/sys_menu.go
+16 -16
View File
@@ -7,7 +7,7 @@ import (
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/admin/service/request"
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
cModels "go-admin/common/models"
@@ -19,7 +19,7 @@ type SysMenu struct {
}
// GetPage 获取SysMenu列表
func (e *SysMenu) GetPage(c *request.SysMenuSearch, menus *[]models.SysMenu) *SysMenu {
func (e *SysMenu) GetPage(c *dto.SysMenuSearch, menus *[]models.SysMenu) *SysMenu {
var menu = make([]models.SysMenu, 0)
err := e.getPage(c, &menu).Error
if err != nil {
@@ -37,7 +37,7 @@ func (e *SysMenu) GetPage(c *request.SysMenuSearch, menus *[]models.SysMenu) *Sy
}
// getPage 菜单分页列表
func (e *SysMenu) getPage(c *request.SysMenuSearch, list *[]models.SysMenu) *SysMenu {
func (e *SysMenu) getPage(c *dto.SysMenuSearch, list *[]models.SysMenu) *SysMenu {
var err error
var data models.SysMenu
@@ -56,7 +56,7 @@ func (e *SysMenu) getPage(c *request.SysMenuSearch, list *[]models.SysMenu) *Sys
}
// Get 获取SysMenu对象
func (e *SysMenu) Get(d *request.SysMenuById, model *models.SysMenu) *SysMenu {
func (e *SysMenu) Get(d *dto.SysMenuById, model *models.SysMenu) *SysMenu {
var err error
var data models.SysMenu
@@ -83,7 +83,7 @@ func (e *SysMenu) Get(d *request.SysMenuById, model *models.SysMenu) *SysMenu {
}
// Insert 创建SysMenu对象
func (e *SysMenu) Insert(c *request.SysMenuControl) *SysMenu {
func (e *SysMenu) Insert(c *dto.SysMenuControl) *SysMenu {
var err error
var data models.SysMenu
c.Generate(&data)
@@ -115,7 +115,7 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error {
}
// Update 修改SysMenu对象
func (e *SysMenu) Update(c *request.SysMenuControl) *SysMenu {
func (e *SysMenu) Update(c *dto.SysMenuControl) *SysMenu {
var err error
tx := e.Orm.Debug().Begin()
defer func() {
@@ -151,7 +151,7 @@ func (e *SysMenu) Update(c *request.SysMenuControl) *SysMenu {
}
// Remove 删除SysMenu
func (e *SysMenu) Remove(d *request.SysMenuById) *SysMenu {
func (e *SysMenu) Remove(d *dto.SysMenuById) *SysMenu {
var err error
var data models.SysMenu
@@ -169,7 +169,7 @@ func (e *SysMenu) Remove(d *request.SysMenuById) *SysMenu {
}
// GetList 获取菜单数据
func (e *SysMenu) GetList(c *request.SysMenuSearch, list *[]models.SysMenu) error {
func (e *SysMenu) GetList(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
var err error
var data models.SysMenu
@@ -186,16 +186,16 @@ func (e *SysMenu) GetList(c *request.SysMenuSearch, list *[]models.SysMenu) erro
}
// SetLabel 修改角色中 设置菜单基础数据
func (e *SysMenu) SetLabel() (m []request.MenuLabel, err error) {
func (e *SysMenu) SetLabel() (m []dto.MenuLabel, err error) {
var list []models.SysMenu
err = e.GetList(&request.SysMenuSearch{}, &list)
err = e.GetList(&dto.SysMenuSearch{}, &list)
m = make([]request.MenuLabel, 0)
m = make([]dto.MenuLabel, 0)
for i := 0; i < len(list); i++ {
if list[i].ParentId != 0 {
continue
}
e := request.MenuLabel{}
e := dto.MenuLabel{}
e.Id = list[i].MenuId
e.Label = list[i].Title
deptsInfo := menuLabelCall(&list, e)
@@ -239,19 +239,19 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName ...string) ([]models.SysMenu, er
}
// menuLabelCall 递归构造组织数据
func menuLabelCall(eList *[]models.SysMenu, dept request.MenuLabel) request.MenuLabel {
func menuLabelCall(eList *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
list := *eList
min := make([]request.MenuLabel, 0)
min := make([]dto.MenuLabel, 0)
for j := 0; j < len(list); j++ {
if dept.Id != list[j].ParentId {
continue
}
mi := request.MenuLabel{}
mi := dto.MenuLabel{}
mi.Id = list[j].MenuId
mi.Label = list[j].Title
mi.Children = []request.MenuLabel{}
mi.Children = []dto.MenuLabel{}
if list[j].MenuType != "F" {
ms := menuLabelCall(eList, mi)
min = append(min, ms)