feat✨ apis路径简化
This commit is contained in:
1 parent
8adc79a5f7
commit
dfd460c50b
56 files changed
+471
-665
No files matched your search
@@ -2,12 +2,12 @@ package dto
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -68,8 +68,8 @@ func (s *SysConfigControl) Bind(ctx *gin.Context) error {
|
||||
}
|
||||
|
||||
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
|
||||
func (s *SysConfigControl) Generate() (*system.SysConfig, error) {
|
||||
return &system.SysConfig{
|
||||
func (s *SysConfigControl) Generate() (*models.SysConfig, error) {
|
||||
return &models.SysConfig{
|
||||
Model: common.Model{Id: s.ID},
|
||||
ConfigName: s.ConfigName,
|
||||
ConfigKey: s.ConfigKey,
|
||||
@@ -114,6 +114,6 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
|
||||
return &system.SysConfig{}, nil
|
||||
}
|
||||
func (s *SysConfigById) GenerateM() (*models.SysConfig, error) {
|
||||
return &models.SysConfig{}, nil
|
||||
}
|
||||
@@ -2,12 +2,12 @@ package dto
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
)
|
||||
|
||||
@@ -74,8 +74,8 @@ func (s *SysDeptControl) Bind(ctx *gin.Context) error {
|
||||
}
|
||||
|
||||
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
|
||||
func (s *SysDeptControl) Generate() (*system.SysDept, error) {
|
||||
return &system.SysDept{
|
||||
func (s *SysDeptControl) Generate() (*models.SysDept, error) {
|
||||
return &models.SysDept{
|
||||
DeptId: s.DeptId,
|
||||
DeptName: s.DeptName,
|
||||
ParentId: s.ParentId,
|
||||
@@ -122,12 +122,12 @@ func (s *SysDeptById) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysDeptById) GenerateM() (*system.SysDept, error) {
|
||||
return &system.SysDept{}, nil
|
||||
func (s *SysDeptById) GenerateM() (*models.SysDept, error) {
|
||||
return &models.SysDept{}, nil
|
||||
}
|
||||
|
||||
type DeptLabel struct {
|
||||
Id int `gorm:"-" json:"id"`
|
||||
Label string `gorm:"-" json:"label"`
|
||||
Children []DeptLabel `gorm:"-" json:"children"`
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
package dto
|
||||
|
||||
import (
|
||||
"go-admin/app/admin/models"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -72,7 +72,7 @@ func (s *SysDictDataControl) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysDictData{
|
||||
return &models.SysDictData{
|
||||
DictCode: s.Id,
|
||||
DictSort: s.DictSort,
|
||||
DictLabel: s.DictLabel,
|
||||
@@ -122,5 +122,5 @@ func (s *SysDictDataById) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysDictData{}, nil
|
||||
}
|
||||
return &models.SysDictData{}, nil
|
||||
}
|
||||
@@ -2,9 +2,9 @@ package dto
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -67,7 +67,7 @@ func (s *SysDictTypeControl) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysDictType{
|
||||
return &models.SysDictType{
|
||||
|
||||
ID: s.Id,
|
||||
DictName: s.DictName,
|
||||
@@ -91,5 +91,5 @@ func (s *SysDictTypeById) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysDictType{}, nil
|
||||
}
|
||||
return &models.SysDictType{}, nil
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
package dto
|
||||
|
||||
import (
|
||||
"go-admin/app/admin/models"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -60,8 +60,8 @@ func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysLoginLogControl) Generate() (*system.SysLoginLog, error) {
|
||||
return &system.SysLoginLog{
|
||||
func (s *SysLoginLogControl) Generate() (*models.SysLoginLog, error) {
|
||||
return &models.SysLoginLog{
|
||||
Model: common.Model{Id: s.ID},
|
||||
Username: s.Username,
|
||||
Status: s.Status,
|
||||
@@ -108,6 +108,6 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById {
|
||||
return &cp
|
||||
}
|
||||
|
||||
func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) {
|
||||
return &system.SysLoginLog{}, nil
|
||||
}
|
||||
func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) {
|
||||
return &models.SysLoginLog{}, nil
|
||||
}
|
||||
@@ -2,12 +2,12 @@ package dto
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
)
|
||||
|
||||
@@ -38,24 +38,26 @@ func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// SysConfigControl 增、改使用的结构体
|
||||
// SysMenuControl 增、改使用的结构体
|
||||
type SysMenuControl struct {
|
||||
MenuId int `uri:"id" comment:"编码"` // 编码
|
||||
MenuName string `form:"menuName" comment:"菜单name"` //菜单name
|
||||
Title string `form:"title" comment:"显示名称"` //显示名称
|
||||
Icon string `form:"icon" comment:"图标"` //图标
|
||||
Path string `form:"path" comment:"路径"` //路径
|
||||
Paths string `form:"paths" comment:"id路径"` //id路径
|
||||
MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型
|
||||
Action string `form:"action" comment:"请求方式"` //请求方式
|
||||
Permission string `form:"permission" comment:"权限编码"` //权限编码
|
||||
ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单
|
||||
NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存
|
||||
Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑
|
||||
Component string `form:"component" comment:"组件"` //组件
|
||||
Sort int `form:"sort" comment:"排序"` //排序
|
||||
Visible string `form:"visible" comment:"是否显示"` //是否显示
|
||||
IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame
|
||||
MenuId int `uri:"id" comment:"编码"` // 编码
|
||||
MenuName string `form:"menuName" comment:"菜单name"` //菜单name
|
||||
Title string `form:"title" comment:"显示名称"` //显示名称
|
||||
Icon string `form:"icon" comment:"图标"` //图标
|
||||
Path string `form:"path" comment:"路径"` //路径
|
||||
Paths string `form:"paths" comment:"id路径"` //id路径
|
||||
MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型
|
||||
SysApi []models.SysApi `form:"sysApi"`
|
||||
Apis []int `form:"apis"`
|
||||
Action string `form:"action" comment:"请求方式"` //请求方式
|
||||
Permission string `form:"permission" comment:"权限编码"` //权限编码
|
||||
ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单
|
||||
NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存
|
||||
Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑
|
||||
Component string `form:"component" comment:"组件"` //组件
|
||||
Sort int `form:"sort" comment:"排序"` //排序
|
||||
Visible string `form:"visible" comment:"是否显示"` //是否显示
|
||||
IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame
|
||||
}
|
||||
|
||||
// Bind 映射上下文中的结构体数据
|
||||
@@ -79,9 +81,9 @@ func (s *SysMenuControl) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
|
||||
func (s *SysMenuControl) Generate() (*system.SysMenu, error) {
|
||||
return &system.SysMenu{
|
||||
// Generate 结构体数据转化 从 Control 至 model 对应的模型
|
||||
func (s *SysMenuControl) Generate() (*models.SysMenu, error) {
|
||||
return &models.SysMenu{
|
||||
MenuId: s.MenuId,
|
||||
MenuName: s.MenuName,
|
||||
Title: s.Title,
|
||||
@@ -90,6 +92,7 @@ func (s *SysMenuControl) Generate() (*system.SysMenu, error) {
|
||||
Paths: s.Paths,
|
||||
MenuType: s.MenuType,
|
||||
Action: s.Action,
|
||||
SysApi: s.SysApi,
|
||||
Permission: s.Permission,
|
||||
ParentId: s.ParentId,
|
||||
NoCache: s.NoCache,
|
||||
@@ -135,8 +138,8 @@ func (s *SysMenuById) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysMenuById) GenerateM() (*system.SysMenu, error) {
|
||||
return &system.SysMenu{}, nil
|
||||
func (s *SysMenuById) GenerateM() (*models.SysMenu, error) {
|
||||
return &models.SysMenu{}, nil
|
||||
}
|
||||
|
||||
type MenuLabel struct {
|
||||
@@ -146,10 +149,10 @@ type MenuLabel struct {
|
||||
}
|
||||
|
||||
type MenuRole struct {
|
||||
system.SysMenus
|
||||
models.SysMenu
|
||||
IsSelect bool `json:"is_select" gorm:"-"`
|
||||
}
|
||||
|
||||
type SelectRole struct {
|
||||
RoleId int `uri:"roleId"`
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
package dto
|
||||
|
||||
import (
|
||||
"go-admin/app/admin/models"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -70,8 +70,8 @@ func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysOperaLogControl) Generate() (*system.SysOperaLog, error) {
|
||||
return &system.SysOperaLog{
|
||||
func (s *SysOperaLogControl) Generate() (*models.SysOperaLog, error) {
|
||||
return &models.SysOperaLog{
|
||||
Model: common.Model{Id: s.ID},
|
||||
Title: s.Title,
|
||||
BusinessType: s.BusinessType,
|
||||
@@ -127,4 +127,4 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
|
||||
|
||||
func (s *SysOperaLogById) SetUpdateBy(id int) {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -2,12 +2,12 @@ package dto
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
)
|
||||
|
||||
@@ -68,8 +68,8 @@ func (s *SysPostControl) Bind(ctx *gin.Context) error {
|
||||
}
|
||||
|
||||
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
|
||||
func (s *SysPostControl) Generate() (*system.SysPost, error) {
|
||||
return &system.SysPost{
|
||||
func (s *SysPostControl) Generate() (*models.SysPost, error) {
|
||||
return &models.SysPost{
|
||||
PostId: s.PostId,
|
||||
PostName: s.PostName,
|
||||
PostCode: s.PostCode,
|
||||
@@ -113,6 +113,6 @@ func (s *SysPostById) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysPostById) GenerateM() (*system.SysPost, error) {
|
||||
return &system.SysPost{}, nil
|
||||
}
|
||||
func (s *SysPostById) GenerateM() (*models.SysPost, error) {
|
||||
return &models.SysPost{}, nil
|
||||
}
|
||||
@@ -2,12 +2,12 @@ package dto
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
)
|
||||
|
||||
@@ -76,8 +76,8 @@ func (s *SysRoleControl) Bind(ctx *gin.Context) error {
|
||||
}
|
||||
|
||||
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
|
||||
func (s *SysRoleControl) Generate() (*system.SysRole, error) {
|
||||
return &system.SysRole{
|
||||
func (s *SysRoleControl) Generate() (*models.SysRole, error) {
|
||||
return &models.SysRole{
|
||||
RoleId: s.RoleId,
|
||||
RoleName: s.RoleName,
|
||||
Status: s.Status,
|
||||
@@ -110,8 +110,8 @@ func (s *SysRoleById) GetId() interface{} {
|
||||
return s.Id
|
||||
}
|
||||
|
||||
func (s *SysRoleById) GenerateM() (*system.SysRole, error) {
|
||||
return &system.SysRole{}, nil
|
||||
func (s *SysRoleById) GenerateM() (*models.SysRole, error) {
|
||||
return &models.SysRole{}, nil
|
||||
}
|
||||
|
||||
// RoleDataScopeReq 角色数据权限修改
|
||||
|
||||
@@ -3,8 +3,8 @@ package dto
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
@@ -77,7 +77,7 @@ func (s *SysUserControl) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysUser{
|
||||
return &models.SysUser{
|
||||
UserId: s.UserId,
|
||||
Username: s.Username,
|
||||
Password: s.Password,
|
||||
@@ -108,11 +108,11 @@ func (s *SysUserById) Generate() dto.Control {
|
||||
}
|
||||
|
||||
func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
|
||||
return &system.SysUser{}, nil
|
||||
return &models.SysUser{}, nil
|
||||
}
|
||||
|
||||
// PassWord 密码
|
||||
type PassWord struct {
|
||||
NewPassword string `json:"newPassword" binding:"required"`
|
||||
OldPassword string `json:"oldPassword" binding:"required"`
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -14,9 +14,9 @@ type SysConfig struct {
|
||||
}
|
||||
|
||||
// GetSysConfigPage 获取SysConfig列表
|
||||
func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error {
|
||||
func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
|
||||
var err error
|
||||
var data system.SysConfig
|
||||
var data models.SysConfig
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -32,9 +32,9 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error {
|
||||
func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]models.SysConfig) error {
|
||||
var err error
|
||||
var data system.SysConfig
|
||||
var data models.SysConfig
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -49,8 +49,8 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.Sys
|
||||
}
|
||||
|
||||
// GetSysConfig 获取SysConfig对象
|
||||
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error {
|
||||
var data system.SysConfig
|
||||
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig) error {
|
||||
var data models.SysConfig
|
||||
|
||||
err := e.Orm.Model(&data).
|
||||
First(model, d.GetId()).Error
|
||||
@@ -67,9 +67,9 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig)
|
||||
}
|
||||
|
||||
// InsertSysConfig 创建SysConfig对象
|
||||
func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
|
||||
func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error {
|
||||
var err error
|
||||
var data system.SysConfig
|
||||
var data models.SysConfig
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -81,7 +81,7 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
|
||||
}
|
||||
|
||||
// UpdateSysConfig 修改SysConfig对象
|
||||
func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
|
||||
func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error {
|
||||
var err error
|
||||
|
||||
db := e.Orm.Model(c).
|
||||
@@ -99,9 +99,9 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
|
||||
}
|
||||
|
||||
// RemoveSysConfig 删除SysConfig
|
||||
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error {
|
||||
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *models.SysConfig) error {
|
||||
var err error
|
||||
var data system.SysConfig
|
||||
var data models.SysConfig
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.Ids).Delete(c)
|
||||
@@ -120,7 +120,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e
|
||||
// GetSysConfigByKEY 根据Key获取SysConfig
|
||||
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
|
||||
var err error
|
||||
var data system.SysConfig
|
||||
var data models.SysConfig
|
||||
data.ConfigKey = c.ConfigKey
|
||||
err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error
|
||||
if err != nil {
|
||||
@@ -129,4 +129,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -4,10 +4,10 @@ import (
|
||||
"errors"
|
||||
log "github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -18,9 +18,9 @@ type SysDept struct {
|
||||
}
|
||||
|
||||
// GetSysDeptPage 获取SysDept列表
|
||||
func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) error {
|
||||
func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]models.SysDept) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -35,9 +35,9 @@ func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) e
|
||||
}
|
||||
|
||||
// GetSysDept 获取SysDept对象
|
||||
func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error {
|
||||
func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
@@ -55,9 +55,9 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error {
|
||||
}
|
||||
|
||||
// InsertSysDept 创建SysDept对象
|
||||
func (e *SysDept) InsertSysDept(model *system.SysDept) error {
|
||||
func (e *SysDept) InsertSysDept(model *models.SysDept) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -67,7 +67,7 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error {
|
||||
}
|
||||
deptPath := "/" + pkg.IntToString(model.DeptId)
|
||||
if model.ParentId != 0 {
|
||||
var deptP system.SysDept
|
||||
var deptP models.SysDept
|
||||
e.Orm.Model(&data).First(&deptP, model.ParentId)
|
||||
deptPath = deptP.DeptPath + deptPath
|
||||
} else {
|
||||
@@ -83,9 +83,9 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error {
|
||||
}
|
||||
|
||||
// UpdateSysDept 修改SysDept对象
|
||||
func (e *SysDept) UpdateSysDept(c *system.SysDept) error {
|
||||
func (e *SysDept) UpdateSysDept(c *models.SysDept) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
@@ -106,7 +106,7 @@ func (e *SysDept) UpdateSysDept(c *system.SysDept) error {
|
||||
// RemoveSysDept 删除SysDept
|
||||
func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.GetId()).Delete(&data)
|
||||
@@ -123,9 +123,9 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error {
|
||||
}
|
||||
|
||||
// GetSysDeptList 获取组织数据
|
||||
func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) error {
|
||||
func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) error {
|
||||
var err error
|
||||
var data system.SysDept
|
||||
var data models.SysDept
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -141,7 +141,7 @@ func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) e
|
||||
|
||||
// SetDeptTree 设置组织数据
|
||||
func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) {
|
||||
var list []system.SysDept
|
||||
var list []models.SysDept
|
||||
err = e.getSysDeptList(c, &list)
|
||||
|
||||
m = make([]dto.DeptLabel, 0)
|
||||
@@ -160,7 +160,7 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err erro
|
||||
}
|
||||
|
||||
// Call 递归构造组织数据
|
||||
func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
||||
func deptTreeCall(deptlist *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
||||
list := *deptlist
|
||||
min := make([]dto.DeptLabel, 0)
|
||||
for j := 0; j < len(list); j++ {
|
||||
@@ -176,8 +176,8 @@ func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel
|
||||
}
|
||||
|
||||
// SetDeptPage 设置dept页面数据
|
||||
func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err error) {
|
||||
var list []system.SysDept
|
||||
func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) {
|
||||
var list []models.SysDept
|
||||
err = e.getSysDeptList(c, &list)
|
||||
|
||||
//m := make([]models.SysDept, 0)
|
||||
@@ -192,16 +192,16 @@ func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err err
|
||||
return
|
||||
}
|
||||
|
||||
func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) system.SysDept {
|
||||
func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) models.SysDept {
|
||||
list := *deptlist
|
||||
|
||||
min := make([]system.SysDept, 0)
|
||||
min := make([]models.SysDept, 0)
|
||||
for j := 0; j < len(list); j++ {
|
||||
|
||||
if menu.DeptId != list[j].ParentId {
|
||||
continue
|
||||
}
|
||||
mi := system.SysDept{}
|
||||
mi := models.SysDept{}
|
||||
mi.DeptId = list[j].DeptId
|
||||
mi.ParentId = list[j].ParentId
|
||||
mi.DeptPath = list[j].DeptPath
|
||||
@@ -212,7 +212,7 @@ func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept)
|
||||
mi.Email = list[j].Email
|
||||
mi.Status = list[j].Status
|
||||
mi.CreatedAt = list[j].CreatedAt
|
||||
mi.Children = []system.SysDept{}
|
||||
mi.Children = []models.SysDept{}
|
||||
ms := e.deptPageCall(deptlist, mi)
|
||||
min = append(min, ms)
|
||||
|
||||
@@ -242,7 +242,7 @@ func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) {
|
||||
}
|
||||
|
||||
func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
|
||||
list := make([]system.SysDept, 0)
|
||||
list := make([]models.SysDept, 0)
|
||||
err = e.Orm.Find(&list).Error
|
||||
if err != nil {
|
||||
log.Error("find dept list error, %s", err.Error())
|
||||
@@ -266,7 +266,7 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
|
||||
}
|
||||
|
||||
// digitDeptLabel
|
||||
func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
||||
func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
||||
list := *deptList
|
||||
|
||||
var mi dto.DeptLabel
|
||||
@@ -283,4 +283,4 @@ func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabe
|
||||
}
|
||||
dept.Children = min
|
||||
return dept
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,10 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -16,9 +16,9 @@ type SysDictData struct {
|
||||
}
|
||||
|
||||
// GetPage 获取列表
|
||||
func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictData, count *int64) error {
|
||||
func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictData, count *int64) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -35,9 +35,9 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictDa
|
||||
}
|
||||
|
||||
// Get 获取对象
|
||||
func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) error {
|
||||
func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
@@ -55,9 +55,9 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) err
|
||||
}
|
||||
|
||||
// Insert 创建对象
|
||||
func (e *SysDictData) Insert(model *system.SysDictData) error {
|
||||
func (e *SysDictData) Insert(model *models.SysDictData) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -69,9 +69,9 @@ func (e *SysDictData) Insert(model *system.SysDictData) error {
|
||||
}
|
||||
|
||||
// Update 修改对象
|
||||
func (e *SysDictData) Update(c *system.SysDictData) error {
|
||||
func (e *SysDictData) Update(c *models.SysDictData) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
@@ -87,9 +87,9 @@ func (e *SysDictData) Update(c *system.SysDictData) error {
|
||||
}
|
||||
|
||||
// Remove 删除
|
||||
func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) error {
|
||||
func (e *SysDictData) Remove(d *dto.SysDictDataById, c *models.SysDictData) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.GetId()).Delete(c)
|
||||
@@ -106,9 +106,9 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro
|
||||
}
|
||||
|
||||
// GetAll 获取所有
|
||||
func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictData) error {
|
||||
func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictData) error {
|
||||
var err error
|
||||
var data system.SysDictData
|
||||
var data models.SysDictData
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -120,4 +120,4 @@ func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictDat
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,10 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -16,9 +16,9 @@ type SysDictType struct {
|
||||
}
|
||||
|
||||
// GetPage 获取列表
|
||||
func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictType, count *int64) error {
|
||||
func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -35,9 +35,9 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictTy
|
||||
}
|
||||
|
||||
// Get 获取对象
|
||||
func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) error {
|
||||
func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
@@ -55,9 +55,9 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) err
|
||||
}
|
||||
|
||||
// Insert 创建对象
|
||||
func (e *SysDictType) Insert(model *system.SysDictType) error {
|
||||
func (e *SysDictType) Insert(model *models.SysDictType) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -69,9 +69,9 @@ func (e *SysDictType) Insert(model *system.SysDictType) error {
|
||||
}
|
||||
|
||||
// Update 修改对象
|
||||
func (e *SysDictType) Update(c *system.SysDictType) error {
|
||||
func (e *SysDictType) Update(c *models.SysDictType) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
@@ -87,9 +87,9 @@ func (e *SysDictType) Update(c *system.SysDictType) error {
|
||||
}
|
||||
|
||||
// Remove 删除
|
||||
func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) error {
|
||||
func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *models.SysDictType) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.GetId()).Delete(c)
|
||||
@@ -106,9 +106,9 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro
|
||||
}
|
||||
|
||||
// GetAll 获取所有
|
||||
func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictType) error {
|
||||
func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictType) error {
|
||||
var err error
|
||||
var data system.SysDictType
|
||||
var data models.SysDictType
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -120,4 +120,4 @@ func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictTyp
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,10 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
@@ -17,9 +17,9 @@ type SysLoginLog struct {
|
||||
}
|
||||
|
||||
// GetSysLoginLogPage 获取SysLoginLog列表
|
||||
func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error {
|
||||
func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error {
|
||||
var err error
|
||||
var data system.SysLoginLog
|
||||
var data models.SysLoginLog
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -36,9 +36,9 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste
|
||||
}
|
||||
|
||||
// GetSysLoginLog 获取SysLoginLog对象
|
||||
func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLoginLog) error {
|
||||
func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *models.SysLoginLog) error {
|
||||
var err error
|
||||
var data system.SysLoginLog
|
||||
var data models.SysLoginLog
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
@@ -58,7 +58,7 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo
|
||||
// InsertSysLoginLog 创建SysLoginLog对象
|
||||
func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error {
|
||||
var err error
|
||||
var data system.SysLoginLog
|
||||
var data models.SysLoginLog
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -72,7 +72,7 @@ func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error {
|
||||
// UpdateSysLoginLog 修改SysLoginLog对象
|
||||
func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error {
|
||||
var err error
|
||||
var data system.SysLoginLog
|
||||
var data models.SysLoginLog
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
@@ -90,7 +90,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error {
|
||||
// RemoveSysLoginLog 删除SysLoginLog
|
||||
func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error {
|
||||
var err error
|
||||
var data system.SysLoginLog
|
||||
var data models.SysLoginLog
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.Ids).Delete(c)
|
||||
@@ -104,4 +104,4 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package service
|
||||
import (
|
||||
"errors"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -15,10 +15,10 @@ type SysMenu struct {
|
||||
}
|
||||
|
||||
// GetSysMenuPage 获取SysMenu列表
|
||||
func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error) {
|
||||
var m = make([]system.SysMenu, 0)
|
||||
func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error) {
|
||||
var m = make([]models.SysMenu, 0)
|
||||
var err error
|
||||
var menu = make([]system.SysMenu, 0)
|
||||
var menu = make([]models.SysMenu, 0)
|
||||
err = e.getSysMenuPage(c, &menu)
|
||||
for i := 0; i < len(menu); i++ {
|
||||
if menu[i].ParentId != 0 {
|
||||
@@ -32,11 +32,11 @@ func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error
|
||||
}
|
||||
|
||||
// getSysMenuPage 菜单列表
|
||||
func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) error {
|
||||
func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
err = e.Orm.Model(&data).Preload("SysApi").
|
||||
Scopes(
|
||||
cDto.OrderDest("sort", false),
|
||||
cDto.MakeCondition(c.GetNeedSearch()),
|
||||
@@ -50,11 +50,11 @@ func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) e
|
||||
}
|
||||
|
||||
// GetSysMenu 获取SysMenu对象
|
||||
func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error {
|
||||
func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
db := e.Orm.Model(&data).Preload("SysApi").
|
||||
First(model, d.GetId())
|
||||
err = db.Error
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
@@ -66,13 +66,16 @@ func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error {
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
for _, v := range model.SysApi {
|
||||
model.Apis = append(model.Apis, v.Id)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// InsertSysMenu 创建SysMenu对象
|
||||
func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error {
|
||||
func (e *SysMenu) InsertSysMenu(model *models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -83,10 +86,10 @@ func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *SysMenu) initPaths(menu *system.SysMenu) error {
|
||||
func (e *SysMenu) initPaths(menu *models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
parentMenu := new(system.SysMenu)
|
||||
var data models.SysMenu
|
||||
parentMenu := new(models.SysMenu)
|
||||
if menu.ParentId != 0 {
|
||||
e.Orm.Model(&data).First(parentMenu, menu.ParentId)
|
||||
if parentMenu.Paths == "" {
|
||||
@@ -102,12 +105,10 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error {
|
||||
}
|
||||
|
||||
// UpdateSysMenu 修改SysMenu对象
|
||||
func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error {
|
||||
func (e *SysMenu) UpdateSysMenu(c *models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
db := e.Orm.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(c)
|
||||
if db.Error != nil {
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
@@ -117,15 +118,15 @@ func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error {
|
||||
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// RemoveSysMenu 删除SysMenu
|
||||
func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(d.GetId()).Delete(&data)
|
||||
Where(d.Ids).Delete(&data)
|
||||
if db.Error != nil {
|
||||
err = db.Error
|
||||
e.Log.Errorf("Delete error: %s", err)
|
||||
@@ -139,9 +140,9 @@ func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error {
|
||||
}
|
||||
|
||||
// GetSysMenuList 获取菜单数据
|
||||
func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) error {
|
||||
func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
|
||||
var err error
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -157,7 +158,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e
|
||||
|
||||
// SetSysMenuTree 设置菜单数据
|
||||
func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) {
|
||||
var list []system.SysMenu
|
||||
var list []models.SysMenu
|
||||
err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list)
|
||||
|
||||
m = make([]dto.MenuLabel, 0)
|
||||
@@ -176,9 +177,9 @@ func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) {
|
||||
}
|
||||
|
||||
// 左侧菜单
|
||||
func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, err error) {
|
||||
func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err error) {
|
||||
var table *gorm.DB
|
||||
var data system.SysMenu
|
||||
var data models.SysMenu
|
||||
|
||||
if roleName == "admin" {
|
||||
table = e.Orm.Model(&data).Select("sys_menu.*")
|
||||
@@ -198,7 +199,7 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu,
|
||||
}
|
||||
|
||||
// menuLabelCall 递归构造组织数据
|
||||
func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
|
||||
func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
|
||||
list := *elist
|
||||
|
||||
min := make([]dto.MenuLabel, 0)
|
||||
@@ -226,16 +227,16 @@ func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
|
||||
return dept
|
||||
}
|
||||
|
||||
func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu {
|
||||
func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu {
|
||||
list := *menulist
|
||||
|
||||
min := make([]system.SysMenu, 0)
|
||||
min := make([]models.SysMenu, 0)
|
||||
for j := 0; j < len(list); j++ {
|
||||
|
||||
if menu.MenuId != list[j].ParentId {
|
||||
continue
|
||||
}
|
||||
mi := system.SysMenu{}
|
||||
mi := models.SysMenu{}
|
||||
mi.MenuId = list[j].MenuId
|
||||
mi.MenuName = list[j].MenuName
|
||||
mi.Title = list[j].Title
|
||||
@@ -251,7 +252,7 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu {
|
||||
mi.Sort = list[j].Sort
|
||||
mi.Visible = list[j].Visible
|
||||
mi.CreatedAt = list[j].CreatedAt
|
||||
mi.Children = []system.SysMenu{}
|
||||
mi.Children = []models.SysMenu{}
|
||||
|
||||
if mi.MenuType != "F" {
|
||||
ms := menuCall(menulist, mi)
|
||||
@@ -266,11 +267,11 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu {
|
||||
return menu
|
||||
}
|
||||
|
||||
func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) {
|
||||
func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) {
|
||||
|
||||
menus, err := e.getByRoleName(roleName)
|
||||
|
||||
m = make([]system.SysMenu, 0)
|
||||
m = make([]models.SysMenu, 0)
|
||||
for i := 0; i < len(menus); i++ {
|
||||
if menus[i].ParentId != 0 {
|
||||
continue
|
||||
@@ -282,8 +283,8 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err error) {
|
||||
var data system.SysMenu
|
||||
func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err error) {
|
||||
var data models.SysMenu
|
||||
|
||||
var table *gorm.DB
|
||||
if roleName == "admin" {
|
||||
@@ -302,4 +303,4 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err er
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -14,9 +14,9 @@ type SysOperaLog struct {
|
||||
}
|
||||
|
||||
// GetSysOperaLogPage 获取SysOperaLog列表
|
||||
func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]system.SysOperaLog, count *int64) error {
|
||||
func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]models.SysOperaLog, count *int64) error {
|
||||
var err error
|
||||
var data system.SysOperaLog
|
||||
var data models.SysOperaLog
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -33,8 +33,8 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste
|
||||
}
|
||||
|
||||
// GetSysOperaLog 获取SysOperaLog对象
|
||||
func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error {
|
||||
var data system.SysOperaLog
|
||||
func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *models.SysOperaLog) error {
|
||||
var data models.SysOperaLog
|
||||
|
||||
err := e.Orm.Model(&data).
|
||||
First(model, d.GetId()).Error
|
||||
@@ -51,9 +51,9 @@ func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOp
|
||||
}
|
||||
|
||||
// InsertSysOperaLog 创建SysOperaLog对象
|
||||
func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error {
|
||||
func (e *SysOperaLog) InsertSysOperaLog(model *models.SysOperaLog) error {
|
||||
var err error
|
||||
var data system.SysOperaLog
|
||||
var data models.SysOperaLog
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -65,7 +65,7 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error {
|
||||
}
|
||||
|
||||
// UpdateSysOperaLog 修改SysOperaLog对象
|
||||
func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error {
|
||||
func (e *SysOperaLog) UpdateSysOperaLog(c *models.SysOperaLog) error {
|
||||
var err error
|
||||
|
||||
db := e.Orm.Model(c).
|
||||
@@ -84,7 +84,7 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error {
|
||||
// RemoveSysOperaLog 删除SysOperaLog
|
||||
func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error {
|
||||
var err error
|
||||
var data system.SysOperaLog
|
||||
var data models.SysOperaLog
|
||||
|
||||
db := e.Orm.Model(&data).Where(d.Ids).Delete(&data)
|
||||
if err = db.Error; err != nil {
|
||||
|
||||
@@ -2,10 +2,10 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -16,9 +16,9 @@ type SysPost struct {
|
||||
}
|
||||
|
||||
// GetSysPostPage 获取SysPost列表
|
||||
func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, count *int64) error {
|
||||
func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, count *int64) error {
|
||||
var err error
|
||||
var data system.SysPost
|
||||
var data models.SysPost
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -35,9 +35,9 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, c
|
||||
}
|
||||
|
||||
// GetSysPost 获取SysPost对象
|
||||
func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error {
|
||||
func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error {
|
||||
var err error
|
||||
var data system.SysPost
|
||||
var data models.SysPost
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
@@ -55,9 +55,9 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error {
|
||||
}
|
||||
|
||||
// InsertSysPost 创建SysPost对象
|
||||
func (e *SysPost) InsertSysPost(model *system.SysPost) error {
|
||||
func (e *SysPost) InsertSysPost(model *models.SysPost) error {
|
||||
var err error
|
||||
var data system.SysPost
|
||||
var data models.SysPost
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -69,9 +69,9 @@ func (e *SysPost) InsertSysPost(model *system.SysPost) error {
|
||||
}
|
||||
|
||||
// UpdateSysPost 修改SysPost对象
|
||||
func (e *SysPost) UpdateSysPost(c *system.SysPost) error {
|
||||
func (e *SysPost) UpdateSysPost(c *models.SysPost) error {
|
||||
var err error
|
||||
var data system.SysPost
|
||||
var data models.SysPost
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Where(c.GetId()).Updates(c)
|
||||
@@ -89,7 +89,7 @@ func (e *SysPost) UpdateSysPost(c *system.SysPost) error {
|
||||
// RemoveSysPost 删除SysPost
|
||||
func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
|
||||
var err error
|
||||
var data system.SysPost
|
||||
var data models.SysPost
|
||||
|
||||
db := e.Orm.Model(&data).Delete(&data, d.GetId())
|
||||
if db.Error != nil {
|
||||
@@ -102,4 +102,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/app/admin/service/dto"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/service"
|
||||
@@ -17,9 +16,9 @@ type SysRole struct {
|
||||
}
|
||||
|
||||
// GetSysRolePage 获取SysRole列表
|
||||
func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, count *int64) error {
|
||||
func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]models.SysRole, count *int64) error {
|
||||
var err error
|
||||
var data system.SysRole
|
||||
var data models.SysRole
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -36,7 +35,7 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c
|
||||
}
|
||||
|
||||
// GetSysRole 获取SysRole对象
|
||||
func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
|
||||
func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *models.SysRole) error {
|
||||
var err error
|
||||
|
||||
db := e.Orm.First(model, d.GetId())
|
||||
@@ -59,9 +58,9 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
|
||||
}
|
||||
|
||||
// InsertSysRole 创建SysRole对象
|
||||
func (e *SysRole) InsertSysRole(c *system.SysRole) error {
|
||||
func (e *SysRole) InsertSysRole(c *models.SysRole) error {
|
||||
var err error
|
||||
var data system.SysRole
|
||||
var data models.SysRole
|
||||
|
||||
tx := e.Orm.Begin()
|
||||
defer func() {
|
||||
@@ -92,7 +91,7 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error {
|
||||
}
|
||||
|
||||
// UpdateSysRole 修改SysRole对象
|
||||
func (e *SysRole) UpdateSysRole(c *system.SysRole) error {
|
||||
func (e *SysRole) UpdateSysRole(c *models.SysRole) error {
|
||||
var err error
|
||||
|
||||
tx := e.Orm.Debug().Begin()
|
||||
@@ -113,7 +112,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error {
|
||||
return errors.New("无权更新该数据")
|
||||
}
|
||||
|
||||
var t system.RoleMenu
|
||||
var t models.RoleMenu
|
||||
err = t.DeleteRoleMenu(tx, c.RoleId)
|
||||
if err != nil {
|
||||
e.Log.Errorf("delete role menu error, %", err.Error())
|
||||
@@ -135,7 +134,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error {
|
||||
// RemoveSysRole 删除SysRole
|
||||
func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error {
|
||||
var err error
|
||||
var data system.SysRole
|
||||
var data models.SysRole
|
||||
|
||||
tx := e.Orm.Begin()
|
||||
defer func() {
|
||||
@@ -188,7 +187,7 @@ func (e *SysRole) GetRoleMenuId(tx *gorm.DB, roleId int) ([]int, error) {
|
||||
return menuIds, nil
|
||||
}
|
||||
|
||||
func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) {
|
||||
func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) {
|
||||
tx := e.Orm.Begin()
|
||||
defer func() {
|
||||
if err != nil {
|
||||
@@ -197,20 +196,20 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) {
|
||||
tx.Commit()
|
||||
}
|
||||
}()
|
||||
err = tx.Model(&system.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error
|
||||
err = tx.Model(&models.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = tx.Where("role_id = ?", c.RoleId).Delete(&system.SysRoleDept{}).Error
|
||||
err = tx.Where("role_id = ?", c.RoleId).Delete(&models.SysRoleDept{}).Error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if c.DataScope == "2" {
|
||||
deptRoles := make([]system.SysRoleDept, len(c.DeptIds))
|
||||
deptRoles := make([]models.SysRoleDept, len(c.DeptIds))
|
||||
for i := range c.DeptIds {
|
||||
deptRoles[i] = system.SysRoleDept{
|
||||
deptRoles[i] = models.SysRoleDept{
|
||||
RoleId: c.RoleId,
|
||||
DeptId: c.DeptIds[i],
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package service
|
||||
import (
|
||||
log "github.com/go-admin-team/go-admin-core/logger"
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/service"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
@@ -13,13 +12,13 @@ type SysRoleMenu struct {
|
||||
}
|
||||
|
||||
func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err error) {
|
||||
var role system.SysRole
|
||||
var role models.SysRole
|
||||
|
||||
msgID := e.MsgID
|
||||
|
||||
menu := make([]models.Menu, 0)
|
||||
roleMenu := make([]system.RoleMenu, len(menuId))
|
||||
casbinRule := make([]system.CasbinRule, 0)
|
||||
roleMenu := make([]models.RoleMenu, len(menuId))
|
||||
casbinRule := make([]models.CasbinRule, 0)
|
||||
//先删除所有的
|
||||
err = e.DeleteRoleMenu(tx, roleId)
|
||||
if err != nil {
|
||||
@@ -40,13 +39,13 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err
|
||||
return
|
||||
}
|
||||
for i := range menu {
|
||||
roleMenu[i] = system.RoleMenu{
|
||||
roleMenu[i] = models.RoleMenu{
|
||||
RoleId: role.RoleId,
|
||||
MenuId: menu[i].MenuId,
|
||||
RoleName: role.RoleKey,
|
||||
}
|
||||
if menu[i].MenuType == "A" {
|
||||
casbinRule = append(casbinRule, system.CasbinRule{
|
||||
casbinRule = append(casbinRule, models.CasbinRule{
|
||||
PType: "p",
|
||||
V0: role.RoleKey,
|
||||
V1: menu[i].Path,
|
||||
@@ -73,18 +72,18 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err
|
||||
func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) {
|
||||
msgID := e.MsgID
|
||||
err = tx.Where("role_id = ?", roleId).
|
||||
Delete(&system.SysRoleDept{}).Error
|
||||
Delete(&models.SysRoleDept{}).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] delete role's dept error, %s", msgID, err.Error())
|
||||
return
|
||||
}
|
||||
err = tx.Where("role_id = ?", roleId).
|
||||
Delete(&system.RoleMenu{}).Error
|
||||
Delete(&models.RoleMenu{}).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] delete role's menu error, %s", msgID, err.Error())
|
||||
return
|
||||
}
|
||||
var role system.SysRole
|
||||
var role models.SysRole
|
||||
err = tx.Where("role_id = ?", roleId).
|
||||
First(&role).Error
|
||||
if err != nil {
|
||||
@@ -92,7 +91,7 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) {
|
||||
return
|
||||
}
|
||||
err = tx.Where("v0 = ?", role.RoleKey).
|
||||
Delete(&system.CasbinRule{}).Error
|
||||
Delete(&models.CasbinRule{}).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error())
|
||||
return
|
||||
@@ -100,8 +99,8 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, error) {
|
||||
var r []system.MenuPath
|
||||
func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, error) {
|
||||
var r []models.MenuPath
|
||||
table := tx.Select("sys_menu.path").Table("sys_role_menu")
|
||||
table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id")
|
||||
table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id")
|
||||
@@ -110,4 +109,4 @@ func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, e
|
||||
return nil, err
|
||||
}
|
||||
return r, nil
|
||||
}
|
||||
}
|
||||
@@ -2,12 +2,12 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/admin/models"
|
||||
|
||||
log "github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models/system"
|
||||
"go-admin/common/actions"
|
||||
cDto "go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
@@ -19,9 +19,9 @@ type SysUser struct {
|
||||
}
|
||||
|
||||
// GetSysUserPage 获取SysUser列表
|
||||
func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]system.SysUser, count *int64) error {
|
||||
func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
|
||||
var err error
|
||||
var data system.SysUser
|
||||
var data models.SysUser
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -40,8 +40,8 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *
|
||||
}
|
||||
|
||||
// GetSysUser 获取SysUser对象
|
||||
func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *system.SysUser) error {
|
||||
var data system.SysUser
|
||||
func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *models.SysUser) error {
|
||||
var data models.SysUser
|
||||
|
||||
err := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -63,7 +63,7 @@ func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *s
|
||||
// InsertSysUser 创建SysUser对象
|
||||
func (e *SysUser) InsertSysUser(model common.ActiveRecord) error {
|
||||
var err error
|
||||
var data system.SysUser
|
||||
var data models.SysUser
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
@@ -96,7 +96,7 @@ func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission
|
||||
// RemoveSysUser 删除SysUser
|
||||
func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error {
|
||||
var err error
|
||||
var data system.SysUser
|
||||
var data models.SysUser
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -119,7 +119,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
|
||||
if newPassword == "" {
|
||||
return nil
|
||||
}
|
||||
c := &system.SysUser{}
|
||||
c := &models.SysUser{}
|
||||
|
||||
err = e.Orm.Model(c).
|
||||
Scopes(
|
||||
@@ -157,7 +157,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]system.SysRole, posts *[]system.SysPost) error {
|
||||
func (e *SysUser) GetSysUserProfile(id int, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
|
||||
err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -172,4 +172,4 @@ func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]syste
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user