odboy/cutego
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化全局变量

Browse Source
This commit is contained in:
odboy
2023-01-18 17:10:16 +08:00
parent 6dbdeb7145
commit c44203b176
25 changed files with 428 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/dao/menu_dao.go
+25 -25
View File
@@ -1,10 +1,10 @@
package dao
import (
"cutego/modules"
"cutego/modules/core/api/v1/request"
"cutego/modules/core/dataobject"
"cutego/modules/core/entity"
"cutego/pkg/common"
"cutego/refs"
"github.com/druidcaesa/gotool"
)
@@ -14,7 +14,7 @@ type MenuDao struct {
// GetMenuPermission 根据用户ID查询权限
func (d MenuDao) GetMenuPermission(id int64) *[]string {
var perms []string
session := modules.SqlDB.Table([]string{"sys_menu", "m"})
session := refs.SqlDB.Table([]string{"sys_menu", "m"})
err := session.Distinct("m.perms").
Join("LEFT", []string{"sys_role_menu", "rm"}, "m.menu_id = rm.menu_id").
Join("LEFT", []string{"sys_user_role", "ur"}, "rm.role_id = ur.role_id").
@@ -28,9 +28,9 @@ func (d MenuDao) GetMenuPermission(id int64) *[]string {
}
// GetMenuAll 查询所有菜单数据
func (d MenuDao) GetMenuAll() *[]dataobject.SysMenu {
menus := make([]dataobject.SysMenu, 0)
session := modules.SqlDB.Table([]string{dataobject.SysMenu{}.TableName(), "m"})
func (d MenuDao) GetMenuAll() *[]entity.SysMenu {
menus := make([]entity.SysMenu, 0)
session := refs.SqlDB.Table([]string{entity.SysMenu{}.TableName(), "m"})
err := session.Distinct("m.menu_id").Cols("m.parent_id", "m.menu_name", "m.path", "m.component", "m.visible", "m.status", "m.perms", "m.is_frame", "m.is_cache", "m.menu_type", "m.icon", "m.order_num", "m.create_time").
Where("m.menu_type in ('M', 'C')").And("m.status = 0").OrderBy("m.parent_id").OrderBy("m.order_num").Find(&menus)
if err != nil {
@@ -41,9 +41,9 @@ func (d MenuDao) GetMenuAll() *[]dataobject.SysMenu {
}
// GetMenuByUserId 根据用户ID查询菜单
func (d MenuDao) GetMenuByUserId(id int64) *[]dataobject.SysMenu {
menus := make([]dataobject.SysMenu, 0)
session := modules.SqlDB.Table([]string{dataobject.SysMenu{}.TableName(), "m"})
func (d MenuDao) GetMenuByUserId(id int64) *[]entity.SysMenu {
menus := make([]entity.SysMenu, 0)
session := refs.SqlDB.Table([]string{entity.SysMenu{}.TableName(), "m"})
err := session.Distinct("m.menu_id").Cols("m.parent_id", "m.menu_name", "m.path", "m.component", "m.visible", "m.status", "m.perms", "m.is_frame", "m.is_cache", "m.menu_type", "m.icon", "m.order_num", "m.create_time").
Join("LEFT", []string{"sys_role_menu", "rm"}, "m.menu_id = rm.menu_id").
Join("LEFT", []string{"sys_user_role", "ur"}, "rm.role_id = ur.role_id").
@@ -60,7 +60,7 @@ func (d MenuDao) GetMenuByUserId(id int64) *[]dataobject.SysMenu {
// SelectMenuByRoleId 根据角色ID查询菜单树信息
func (d MenuDao) SelectMenuByRoleId(id int64, strictly bool) *[]int64 {
list := make([]int64, 0)
session := modules.SqlDB.NewSession().Table([]string{"sys_menu", "m"})
session := refs.SqlDB.NewSession().Table([]string{"sys_menu", "m"})
session.Join("LEFT", []string{"sys_role_menu", "rm"}, "m.menu_id = rm.menu_id")
session.Where("rm.role_id = ?", id)
if strictly {
@@ -75,9 +75,9 @@ func (d MenuDao) SelectMenuByRoleId(id int64, strictly bool) *[]int64 {
}
// SelectMenuList 查询系统菜单列表
func (d MenuDao) SelectMenuList(query request.MenuQuery) *[]dataobject.SysMenu {
list := make([]dataobject.SysMenu, 0)
session := modules.SqlDB.NewSession().OrderBy("parent_id").OrderBy("order_num")
func (d MenuDao) SelectMenuList(query request.MenuQuery) *[]entity.SysMenu {
list := make([]entity.SysMenu, 0)
session := refs.SqlDB.NewSession().OrderBy("parent_id").OrderBy("order_num")
if gotool.StrUtils.HasNotEmpty(query.MenuName) {
session.And("menu_name like concat('%', ?, '%')", query.MenuName)
}
@@ -96,9 +96,9 @@ func (d MenuDao) SelectMenuList(query request.MenuQuery) *[]dataobject.SysMenu {
}
// SelectMenuListByUserId 根据用户查询系统菜单列表
func (d MenuDao) SelectMenuListByUserId(query request.MenuQuery) *[]dataobject.SysMenu {
session := modules.SqlDB.NewSession().OrderBy("parent_id").OrderBy("order_num")
list := make([]dataobject.SysMenu, 0)
func (d MenuDao) SelectMenuListByUserId(query request.MenuQuery) *[]entity.SysMenu {
session := refs.SqlDB.NewSession().OrderBy("parent_id").OrderBy("order_num")
list := make([]entity.SysMenu, 0)
session.Distinct("m.menu_id", "m.parent_id", "m.menu_name", "m.path", "m.component", "m.visible", "m.status", "ifnull(m.perms,'') as perms", "m.is_frame", "m.is_cache", "m.menu_type", "m.icon", "m.order_num", "m.create_time")
session.Join("LEFT", []string{"sys_role_menu", "rm"}, "m.menu_id = rm.menu_id").
Join("LEFT", []string{"sys_user_role", "ur"}, "rm.role_id = ur.role_id").
@@ -122,11 +122,11 @@ func (d MenuDao) SelectMenuListByUserId(query request.MenuQuery) *[]dataobject.S
}
// SelectMenuByMenuId 根据菜单ID查询信息
func (d MenuDao) SelectMenuByMenuId(id int) *dataobject.SysMenu {
menu := dataobject.SysMenu{
func (d MenuDao) SelectMenuByMenuId(id int) *entity.SysMenu {
menu := entity.SysMenu{
MenuId: id,
}
_, err := modules.SqlDB.NewSession().Where("menu_id = ?", menu.MenuId).Get(&menu)
_, err := refs.SqlDB.NewSession().Where("menu_id = ?", menu.MenuId).Get(&menu)
if err != nil {
common.ErrorLog(err)
return nil
@@ -135,8 +135,8 @@ func (d MenuDao) SelectMenuByMenuId(id int) *dataobject.SysMenu {
}
// Insert 添加菜单数据
func (d MenuDao) Insert(menu dataobject.SysMenu) int64 {
session := modules.SqlDB.NewSession()
func (d MenuDao) Insert(menu entity.SysMenu) int64 {
session := refs.SqlDB.NewSession()
session.Begin()
insert, err := session.Insert(&menu)
if err != nil {
@@ -149,8 +149,8 @@ func (d MenuDao) Insert(menu dataobject.SysMenu) int64 {
}
// Update 修改菜单数据
func (d MenuDao) Update(menu dataobject.SysMenu) int64 {
session := modules.SqlDB.NewSession()
func (d MenuDao) Update(menu entity.SysMenu) int64 {
session := refs.SqlDB.NewSession()
session.Begin()
update, err := session.Where("menu_id = ?", menu.MenuId).Update(&menu)
if err != nil {
@@ -164,10 +164,10 @@ func (d MenuDao) Update(menu dataobject.SysMenu) int64 {
// Delete 删除菜单操作
func (d MenuDao) Delete(id int) int64 {
menu := dataobject.SysMenu{
menu := entity.SysMenu{
MenuId: id,
}
session := modules.SqlDB.NewSession()
session := refs.SqlDB.NewSession()
session.Begin()
i, err := session.Delete(&menu)
if err != nil {