This commit is contained in:
2025-03-31 11:59:42 +08:00
parent 963e1e005e
commit 6fb06c456c
52 changed files with 2244 additions and 753 deletions

View File

@@ -2,18 +2,17 @@ package system
import (
"context"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
)
type AuditBiz interface {
Create(ctx context.Context, arg *db.CreateSysAuditLogParams) error
AuditExpansion
List(ctx context.Context, q dto.SearchDto) ([]*db.SysAuditLog, int64, error)
}
type AuditExpansion interface{}
type auditBiz struct {
store db.Store
}
@@ -29,3 +28,42 @@ func NewAudit(store db.Store) *auditBiz {
func (b *auditBiz) Create(ctx context.Context, arg *db.CreateSysAuditLogParams) error {
return b.store.CreateSysAuditLog(ctx, arg)
}
func (b *auditBiz) List(ctx context.Context, q dto.SearchDto) ([]*db.SysAuditLog, int64, error) {
start, err := time.ParseInLocation(time.DateTime, q.SearchTimeBegin, time.Local)
if err != nil {
return nil, 0, err
}
end, err := time.ParseInLocation(time.DateTime, q.SearchTimeEnd, time.Local)
if err != nil {
return nil, 0, err
}
countArg := &db.CountSysAuditLogConditionParams{
StartAt: start,
EndAt: end,
Email: q.SearchEmail,
Username: q.SearchName,
}
dataArg := &db.ListSysAuditLogConditionParams{
StartAt: start,
EndAt: end,
Email: q.SearchEmail,
Username: q.SearchName,
Skip: (int32(q.Page) - 1) * int32(q.Rows),
Size: int32(q.Rows),
}
count, err := b.store.CountSysAuditLogCondition(ctx, countArg)
if err != nil {
return nil, 0, err
}
audits, err := b.store.ListSysAuditLogCondition(ctx, dataArg)
if err != nil {
return nil, 0, err
}
return audits, count, nil
}

View File

@@ -10,7 +10,6 @@ import (
"management/internal/global/keys"
"management/internal/global/pearadmin"
"management/internal/pkg/redis"
"management/internal/pkg/session"
)
type ConfigBiz interface {
@@ -22,18 +21,16 @@ type ConfigExpansion interface {
}
type configBiz struct {
store db.Store
redis redis.IRedis
session session.ISession
store db.Store
redis redis.IRedis
}
var _ ConfigBiz = (*configBiz)(nil)
func NewConfig(store db.Store, redis redis.IRedis, session session.ISession) *configBiz {
func NewConfig(store db.Store, redis redis.IRedis) *configBiz {
return &configBiz{
store: store,
redis: redis,
session: session,
store: store,
redis: redis,
}
}

View File

@@ -11,7 +11,6 @@ import (
"management/internal/erpserver/model/view"
"management/internal/global/keys"
"management/internal/pkg/redis"
"management/internal/pkg/session"
)
type DepartmentBiz interface {
@@ -32,18 +31,16 @@ type DepartmentBiz interface {
type DepartmentExpansion interface{}
type departmentBiz struct {
store db.Store
redis redis.IRedis
session session.ISession
store db.Store
redis redis.IRedis
}
var _ DepartmentBiz = (*departmentBiz)(nil)
func NewDepartment(store db.Store, redis redis.IRedis, session session.ISession) *departmentBiz {
func NewDepartment(store db.Store, redis redis.IRedis) *departmentBiz {
return &departmentBiz{
store: store,
redis: redis,
session: session,
store: store,
redis: redis,
}
}
@@ -126,52 +123,36 @@ func (b *departmentBiz) Refresh(ctx context.Context) ([]*db.SysDepartment, error
return all, nil
}
func (h *departmentBiz) RebuildParentPath(ctx context.Context) error {
return h.store.SysDepartmentRebuildPath(ctx)
func (b *departmentBiz) RebuildParentPath(ctx context.Context) error {
return b.store.SysDepartmentRebuildPath(ctx)
}
func (h *departmentBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error) {
all, err := h.All(ctx)
func (b *departmentBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err
}
return toLayuiTree(id, all), nil
return b.toTree(id, all), nil
}
func (h *departmentBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := h.All(ctx)
func (b *departmentBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err
}
return toXmSelectTree(id, all), nil
return b.toXmSelectTree(id, all), nil
}
func toXmSelectTree(parentId int32, data []*db.SysDepartment) []*view.XmSelectTree {
var res []*view.XmSelectTree
for _, v := range data {
if v.ParentID == parentId {
item := view.XmSelectTree{
Name: v.Name,
Value: strconv.FormatInt(int64(v.ID), 10),
Children: toXmSelectTree(v.ID, data),
}
res = append(res, &item)
}
}
return res
}
func toLayuiTree(parentId int32, data []*db.SysDepartment) []*view.LayuiTree {
func (b *departmentBiz) toTree(parentId int32, data []*db.SysDepartment) []*view.LayuiTree {
var res []*view.LayuiTree
for _, v := range data {
if v.ParentID == parentId {
item := view.LayuiTree{}
item.ID = strconv.FormatInt(int64(v.ID), 10)
item.Title = v.Name
item.Children = toLayuiTree(v.ID, data)
item.Children = b.toTree(v.ID, data)
if v.ParentID == 0 {
item.Spread = true
}
@@ -181,3 +162,19 @@ func toLayuiTree(parentId int32, data []*db.SysDepartment) []*view.LayuiTree {
return res
}
func (b *departmentBiz) toXmSelectTree(parentId int32, data []*db.SysDepartment) []*view.XmSelectTree {
var res []*view.XmSelectTree
for _, v := range data {
if v.ParentID == parentId {
item := view.XmSelectTree{
Name: v.Name,
Value: strconv.FormatInt(int64(v.ID), 10),
Children: b.toXmSelectTree(v.ID, data),
}
res = append(res, &item)
}
}
return res
}

View File

@@ -0,0 +1,69 @@
package system
import (
"context"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
)
type LoginLogBiz interface {
Create(ctx context.Context, arg *db.CreateSysUserLoginLogParams) error
List(ctx context.Context, q dto.SearchDto) ([]*db.SysUserLoginLog, int64, error)
}
type loginLogBiz struct {
store db.Store
}
var _ LoginLogBiz = (*loginLogBiz)(nil)
func NewLoginLog(store db.Store) *loginLogBiz {
return &loginLogBiz{
store: store,
}
}
func (b *loginLogBiz) Create(ctx context.Context, arg *db.CreateSysUserLoginLogParams) error {
return b.store.CreateSysUserLoginLog(ctx, arg)
}
func (b *loginLogBiz) List(ctx context.Context, q dto.SearchDto) ([]*db.SysUserLoginLog, int64, error) {
start, err := time.ParseInLocation(time.DateTime, q.SearchTimeBegin, time.Local)
if err != nil {
return nil, 0, err
}
end, err := time.ParseInLocation(time.DateTime, q.SearchTimeEnd, time.Local)
if err != nil {
return nil, 0, err
}
countArg := &db.CountSysUserLoginLogConditionParams{
StartAt: start,
EndAt: end,
Email: q.SearchEmail,
Username: q.SearchName,
}
dataArg := &db.ListSysUserLoginLogConditionParams{
StartAt: start,
EndAt: end,
Email: q.SearchEmail,
Username: q.SearchName,
Skip: (int32(q.Page) - 1) * int32(q.Rows),
Size: int32(q.Rows),
}
count, err := b.store.CountSysUserLoginLogCondition(ctx, countArg)
if err != nil {
return nil, 0, err
}
logs, err := b.store.ListSysUserLoginLogCondition(ctx, dataArg)
if err != nil {
return nil, 0, err
}
return logs, count, nil
}

View File

@@ -9,9 +9,9 @@ import (
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/model/view"
"management/internal/global/keys"
"management/internal/pkg/redis"
"management/internal/pkg/session"
)
type MenuBiz interface {
@@ -19,34 +19,87 @@ type MenuBiz interface {
}
type MenuExpansion interface {
Create(ctx context.Context, arg *db.CreateSysMenuParams) (*db.SysMenu, error)
Update(ctx context.Context, arg *db.UpdateSysMenuParams) (*db.SysMenu, error)
Get(ctx context.Context, id int32) (*db.SysMenu, error)
GetSysMenuByUrl(ctx context.Context, url string) (*db.SysMenu, error)
AllMenusCache(ctx context.Context) ([]*db.SysMenu, error)
ListMenuTree(ctx context.Context) ([]*db.SysMenuDto, error)
ListOwnerMenuByRoleID(ctx context.Context, roleID int32) ([]*dto.OwnerMenuDto, error)
SetOwnerListMenuByRoleID(ctx context.Context, roleID int32) ([]*dto.OwnerMenuDto, error)
RecursiveSysMenus(ctx context.Context, roleID int32) ([]*dto.MenuUIDto, error)
SetRecursiveSysMenus(ctx context.Context, roleID int32) ([]*dto.MenuUIDto, error)
MapOwnerMenuByRoleID(ctx context.Context, roleID int32) (map[string]*dto.OwnerMenuDto, error)
SetOwnerMapMenuByRoleID(ctx context.Context, roleID int32) (map[string]*dto.OwnerMenuDto, error)
RefreshMenus(ctx context.Context) error
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
}
type menuBiz struct {
store db.Store
redis redis.IRedis
session session.ISession
store db.Store
redis redis.IRedis
}
var _ MenuBiz = (*menuBiz)(nil)
func NewMenu(store db.Store, redis redis.IRedis, session session.ISession) *menuBiz {
func NewMenu(store db.Store, redis redis.IRedis) *menuBiz {
return &menuBiz{
store: store,
redis: redis,
session: session,
store: store,
redis: redis,
}
}
func (b *menuBiz) Create(ctx context.Context, arg *db.CreateSysMenuParams) (*db.SysMenu, error) {
return b.store.CreateSysMenu(ctx, arg)
}
func (b *menuBiz) Update(ctx context.Context, arg *db.UpdateSysMenuParams) (*db.SysMenu, error) {
return b.store.UpdateSysMenu(ctx, arg)
}
func (b *menuBiz) Get(ctx context.Context, id int32) (*db.SysMenu, error) {
return b.store.GetSysMenu(ctx, id)
}
func (b *menuBiz) GetSysMenuByUrl(ctx context.Context, url string) (*db.SysMenu, error) {
return b.store.GetSysMenuByUrl(ctx, url)
}
func (b *menuBiz) AllMenusCache(ctx context.Context) ([]*db.SysMenu, error) {
key := keys.GetManageKey(ctx, keys.AllMenus)
bs, err := b.redis.GetBytes(ctx, key)
if err == nil {
var res []*db.SysMenu
if err := json.Unmarshal(bs, &res); err == nil {
return res, nil
}
}
all, err := b.store.AllSysMenu(ctx)
if err != nil {
return nil, err
}
bs, err = json.Marshal(all)
if err != nil {
return nil, err
}
_ = redis.Set(ctx, key, bs, time.Hour*6)
return all, nil
}
func (b *menuBiz) ListMenuTree(ctx context.Context) ([]*db.SysMenuDto, error) {
all, err := b.AllMenusCache(ctx)
if err != nil {
return nil, err
}
return toTreeSysMenu(0, all), nil
}
func (b *menuBiz) ListOwnerMenuByRoleID(ctx context.Context, roleID int32) ([]*dto.OwnerMenuDto, error) {
// 判断redis是否存储
key := keys.GetManageKey(ctx, keys.OwnerMenus, roleID)
@@ -187,6 +240,40 @@ func (b *menuBiz) SetOwnerMapMenuByRoleID(ctx context.Context, roleID int32) (ma
return result, nil
}
func (b *menuBiz) RefreshMenus(ctx context.Context) error {
all, err := b.store.AllSysMenu(ctx)
if err != nil {
return err
}
bs, err := json.Marshal(all)
if err != nil {
return err
}
key := keys.GetManageKey(ctx, keys.AllMenus)
err = redis.Set(ctx, key, bs, time.Hour*6)
return err
}
func (b *menuBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error) {
all, err := b.AllMenusCache(ctx)
if err != nil {
return nil, err
}
return b.toTree(id, all), nil
}
func (b *menuBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.AllMenusCache(ctx)
if err != nil {
return nil, err
}
return b.toXmSelectTree(id, all), nil
}
func (b *menuBiz) ownerMenusByRoleID(ctx context.Context, roleID int32) ([]*db.SysMenu, error) {
// 判断当前用户是否有vip角色
role, err := b.store.GetSysRole(ctx, roleID)
@@ -214,6 +301,68 @@ func (b *menuBiz) ownerMenusByRoleID(ctx context.Context, roleID int32) ([]*db.S
return menus, nil
}
func (b *menuBiz) toTree(parentId int32, data []*db.SysMenu) []*view.LayuiTree {
var res []*view.LayuiTree
for _, v := range data {
if v.ParentID == parentId {
item := view.LayuiTree{}
item.ID = strconv.FormatInt(int64(v.ID), 10)
item.Title = v.DisplayName
item.Children = b.toTree(v.ID, data)
if v.ParentID == 0 {
item.Spread = true
}
res = append(res, &item)
}
}
return res
}
func (b *menuBiz) toXmSelectTree(parentId int32, data []*db.SysMenu) []*view.XmSelectTree {
var res []*view.XmSelectTree
for _, v := range data {
if v.ParentID == parentId {
item := view.XmSelectTree{
Name: v.DisplayName,
Value: strconv.FormatInt(int64(v.ID), 10),
Children: b.toXmSelectTree(v.ID, data),
}
res = append(res, &item)
}
}
return res
}
func toTreeSysMenu(parentId int32, data []*db.SysMenu) []*db.SysMenuDto {
var res []*db.SysMenuDto
for _, v := range data {
if v.ParentID == parentId {
item := db.SysMenuDto{}
item.ID = v.ID
item.Name = v.Name
item.DisplayName = v.DisplayName
item.Url = v.Url
item.Type = v.Type
item.ParentID = v.ParentID
item.ParentPath = v.ParentPath
item.Avatar = v.Avatar
item.Style = v.Style
item.Visible = v.Visible
item.IsList = v.IsList
item.Status = v.Status
item.Sort = v.Sort
item.CreatedAt = v.CreatedAt
item.UpdatedAt = v.UpdatedAt
item.Children = toTreeSysMenu(v.ID, data)
res = append(res, &item)
}
}
return res
}
func convertToMenuUIDto(data []*db.RecursiveSysMenusRow) []*db.SysMenu {
var res []*db.SysMenu

View File

@@ -0,0 +1,180 @@
package system
import (
"context"
"encoding/json"
"strconv"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/model/view"
"management/internal/global/keys"
"management/internal/pkg/redis"
)
type RoleBiz interface {
Create(ctx context.Context, arg *db.CreateSysRoleParams) (*db.SysRole, error)
Update(ctx context.Context, arg *db.UpdateSysRoleParams) (*db.SysRole, error)
All(ctx context.Context) ([]*db.SysRole, error)
List(ctx context.Context, q dto.SearchDto) ([]*db.SysRole, int64, error)
Get(ctx context.Context, id int32) (*db.SysRole, error)
Refresh(ctx context.Context) ([]*db.SysRole, error)
RebuildParentPath(ctx context.Context) error
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
RoleExpansion
}
type RoleExpansion interface{}
type roleBiz struct {
store db.Store
redis redis.IRedis
}
var _ RoleBiz = (*roleBiz)(nil)
func NewRole(store db.Store, redis redis.IRedis) *roleBiz {
return &roleBiz{
store: store,
redis: redis,
}
}
func (b *roleBiz) Create(ctx context.Context, arg *db.CreateSysRoleParams) (*db.SysRole, error) {
return b.store.CreateSysRole(ctx, arg)
}
func (b *roleBiz) Update(ctx context.Context, arg *db.UpdateSysRoleParams) (*db.SysRole, error) {
return b.store.UpdateSysRole(ctx, arg)
}
func (b *roleBiz) All(ctx context.Context) ([]*db.SysRole, error) {
key := keys.GetManageKey(ctx, keys.AllRoles)
bs, err := redis.GetBytes(ctx, key)
if err == nil {
var res []*db.SysRole
if err := json.Unmarshal(bs, &res); err == nil {
return res, nil
}
}
return b.Refresh(ctx)
}
func (b *roleBiz) List(ctx context.Context, q dto.SearchDto) ([]*db.SysRole, int64, error) {
countArg := &db.CountSysRoleConditionParams{
IsStatus: q.SearchStatus != 9999,
Status: int32(q.SearchStatus),
IsID: q.SearchID != 0,
ID: int32(q.SearchID),
IsParentID: q.SearchParentID != 0,
ParentID: int32(q.SearchParentID),
DisplayName: q.SearchName,
}
dataArg := &db.ListSysRoleConditionParams{
IsStatus: q.SearchStatus != 9999,
Status: int32(q.SearchStatus),
IsID: q.SearchID != 0,
ID: int32(q.SearchID),
IsParentID: q.SearchParentID != 0,
ParentID: int32(q.SearchParentID),
DisplayName: q.SearchName,
Skip: (int32(q.Page) - 1) * int32(q.Rows),
Size: int32(q.Rows),
}
count, err := b.store.CountSysRoleCondition(ctx, countArg)
if err != nil {
return nil, 0, err
}
departs, err := b.store.ListSysRoleCondition(ctx, dataArg)
if err != nil {
return nil, 0, err
}
return departs, count, nil
}
func (b *roleBiz) Get(ctx context.Context, id int32) (*db.SysRole, error) {
return b.store.GetSysRole(ctx, id)
}
func (b *roleBiz) Refresh(ctx context.Context) ([]*db.SysRole, error) {
all, err := b.store.AllSysRole(ctx)
if err != nil {
return nil, err
}
bs, err := json.Marshal(all)
if err != nil {
return nil, err
}
key := keys.GetManageKey(ctx, keys.AllRoles)
err = redis.Set(ctx, key, bs, time.Hour*6)
if err != nil {
return nil, err
}
return all, nil
}
func (b *roleBiz) RebuildParentPath(ctx context.Context) error {
return b.store.SysRoleRebuildPath(ctx)
}
func (b *roleBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err
}
return b.toTree(id, all), nil
}
func (b *roleBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err
}
return b.toXmSelectTree(id, all), nil
}
func (b *roleBiz) toTree(parentId int32, data []*db.SysRole) []*view.LayuiTree {
var res []*view.LayuiTree
for _, v := range data {
if v.ParentID == parentId {
item := view.LayuiTree{}
item.ID = strconv.FormatInt(int64(v.ID), 10)
item.Title = v.DisplayName
item.Children = b.toTree(v.ID, data)
if v.ParentID == 0 {
item.Spread = true
}
res = append(res, &item)
}
}
return res
}
func (b *roleBiz) toXmSelectTree(parentId int32, data []*db.SysRole) []*view.XmSelectTree {
var res []*view.XmSelectTree
for _, v := range data {
if v.ParentID == parentId {
item := view.XmSelectTree{
Name: v.DisplayName,
Value: strconv.FormatInt(int64(v.ID), 10),
Children: b.toXmSelectTree(v.ID, data),
}
res = append(res, &item)
}
}
return res
}

View File

@@ -9,9 +9,11 @@ import (
type SystemBiz interface {
UserBiz() UserBiz
MenuBiz() MenuBiz
RoleBiz() RoleBiz
DepartmentBiz() DepartmentBiz
AuditBiz() AuditBiz
ConfigBiz() ConfigBiz
AuditBiz() AuditBiz
LoginLogBiz() LoginLogBiz
}
type systemBiz struct {
@@ -35,17 +37,25 @@ func (b *systemBiz) UserBiz() UserBiz {
}
func (b *systemBiz) MenuBiz() MenuBiz {
return NewMenu(b.store, b.redis, b.session)
return NewMenu(b.store, b.redis)
}
func (b *systemBiz) RoleBiz() RoleBiz {
return NewRole(b.store, b.redis)
}
func (b *systemBiz) DepartmentBiz() DepartmentBiz {
return NewDepartment(b.store, b.redis, b.session)
return NewDepartment(b.store, b.redis)
}
func (b *systemBiz) ConfigBiz() ConfigBiz {
return NewConfig(b.store, b.redis)
}
func (b *systemBiz) AuditBiz() AuditBiz {
return NewAudit(b.store)
}
func (b *systemBiz) ConfigBiz() ConfigBiz {
return NewConfig(b.store, b.redis, b.session)
func (b *systemBiz) LoginLogBiz() LoginLogBiz {
return NewLoginLog(b.store)
}

View File

@@ -17,6 +17,9 @@ import (
// UserBiz 定义处理用户请求所需的方法.
type UserBiz interface {
Create(ctx context.Context, req *db.CreateSysUserParams) (*db.SysUser, error)
Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error)
List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error)
Get(ctx context.Context, id int32) (*db.SysUser, error)
UserExpansion
}
@@ -46,6 +49,44 @@ func (b *userBiz) Create(ctx context.Context, req *db.CreateSysUserParams) (*db.
return b.store.CreateSysUser(ctx, req)
}
func (b *userBiz) Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error) {
return b.store.UpdateSysUser(ctx, req)
}
func (b *userBiz) List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error) {
count, err := b.store.CountSysUserCondition(ctx, &db.CountSysUserConditionParams{
IsStatus: q.SearchStatus != 9999,
Status: int32(q.SearchStatus),
IsID: q.SearchID != 0,
ID: int32(q.SearchID),
Username: q.SearchName,
Email: q.SearchEmail,
})
if err != nil {
return nil, 0, err
}
users, err := b.store.ListSysUserCondition(ctx, &db.ListSysUserConditionParams{
IsStatus: q.SearchStatus != 9999,
Status: int32(q.SearchStatus),
IsID: q.SearchID != 0,
ID: int32(q.SearchID),
Username: q.SearchName,
Email: q.SearchEmail,
Skip: (int32(q.Page) - 1) * int32(q.Rows),
Size: int32(q.Rows),
})
if err != nil {
return nil, 0, err
}
return users, count, nil
}
func (b *userBiz) Get(ctx context.Context, id int32) (*db.SysUser, error) {
return b.store.GetSysUser(ctx, id)
}
func (b *userBiz) Login(ctx context.Context, req *req.Login) error {
log := &db.CreateSysUserLoginLogParams{
CreatedAt: time.Now(),