v2_10
This commit is contained in:
@@ -3,6 +3,7 @@ package system
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
@@ -11,6 +12,7 @@ import (
|
||||
"management/internal/erpserver/model/view"
|
||||
"management/internal/global/keys"
|
||||
"management/internal/pkg/redis"
|
||||
"management/internal/pkg/tpl/html"
|
||||
)
|
||||
|
||||
type CategoryBiz interface {
|
||||
@@ -23,7 +25,9 @@ type CategoryBiz interface {
|
||||
RebuildParentPath(ctx context.Context) error
|
||||
|
||||
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
|
||||
ListHtmlByLetter(ctx context.Context, letter string) ([]*html.SelectDict, error)
|
||||
}
|
||||
|
||||
type categoryBiz struct {
|
||||
@@ -130,7 +134,7 @@ func (b *categoryBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, er
|
||||
return b.toTree(id, all), nil
|
||||
}
|
||||
|
||||
func (b *categoryBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
func (b *categoryBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
all, err := b.All(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -139,6 +143,41 @@ func (b *categoryBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectT
|
||||
return b.toXmSelectTree(id, all), nil
|
||||
}
|
||||
|
||||
func (b *categoryBiz) ListHtmlByLetter(ctx context.Context, letter string) ([]*html.SelectDict, error) {
|
||||
all, err := b.All(ctx)
|
||||
if err != nil || len(all) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var current *db.Category
|
||||
for _, v := range all {
|
||||
if v.Letter == letter {
|
||||
current = v
|
||||
break
|
||||
}
|
||||
}
|
||||
if current == nil {
|
||||
return nil, errors.New("未找到当前类别")
|
||||
}
|
||||
|
||||
var res []*html.SelectDict
|
||||
res = append(res, &html.SelectDict{
|
||||
Name: "请选择",
|
||||
Value: "0",
|
||||
})
|
||||
for _, v := range all {
|
||||
if v.ParentID == current.ID {
|
||||
item := html.SelectDict{
|
||||
Name: v.Name,
|
||||
Value: strconv.Itoa(int(v.ID)),
|
||||
}
|
||||
res = append(res, &item)
|
||||
}
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (b *categoryBiz) toTree(parentId int32, data []*db.Category) []*view.LayuiTree {
|
||||
var res []*view.LayuiTree
|
||||
for _, v := range data {
|
||||
|
||||
@@ -23,7 +23,7 @@ type DepartmentBiz interface {
|
||||
RebuildParentPath(ctx context.Context) error
|
||||
|
||||
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
|
||||
DepartmentExpansion
|
||||
}
|
||||
@@ -136,7 +136,7 @@ func (b *departmentBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree,
|
||||
return b.toTree(id, all), nil
|
||||
}
|
||||
|
||||
func (b *departmentBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
func (b *departmentBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
all, err := b.All(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -36,7 +36,7 @@ type MenuExpansion interface {
|
||||
SetMenuViewData(ctx context.Context, roleID int32) ([]*dto.SetMenuDto, error)
|
||||
|
||||
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
SetMenu(ctx context.Context, roleID int32, menus []*db.SysMenu) error
|
||||
}
|
||||
|
||||
@@ -268,7 +268,7 @@ func (b *menuBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
return b.toTree(id, all), nil
|
||||
}
|
||||
|
||||
func (b *menuBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
func (b *menuBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
all, err := b.AllMenusCache(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -23,7 +23,7 @@ type RoleBiz interface {
|
||||
RebuildParentPath(ctx context.Context) error
|
||||
|
||||
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
|
||||
|
||||
RoleExpansion
|
||||
}
|
||||
@@ -136,7 +136,7 @@ func (b *roleBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
|
||||
return b.toTree(id, all), nil
|
||||
}
|
||||
|
||||
func (b *roleBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
func (b *roleBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
|
||||
all, err := b.All(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -4,11 +4,13 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
db "management/internal/db/sqlc"
|
||||
"management/internal/erpserver/model/req"
|
||||
"management/internal/erpserver/model/view"
|
||||
"management/internal/global/know"
|
||||
"management/internal/pkg/crypto"
|
||||
"management/internal/pkg/session"
|
||||
@@ -18,9 +20,12 @@ import (
|
||||
type UserBiz interface {
|
||||
Create(ctx context.Context, req *db.CreateSysUserParams) (*db.SysUser, error)
|
||||
Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error)
|
||||
All(ctx context.Context) ([]*db.SysUser, error)
|
||||
List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error)
|
||||
Get(ctx context.Context, id int32) (*db.SysUser, error)
|
||||
|
||||
XmSelect(ctx context.Context) ([]*view.XmSelect, error)
|
||||
|
||||
UserExpansion
|
||||
}
|
||||
|
||||
@@ -53,6 +58,10 @@ func (b *userBiz) Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.
|
||||
return b.store.UpdateSysUser(ctx, req)
|
||||
}
|
||||
|
||||
func (b *userBiz) All(ctx context.Context) ([]*db.SysUser, error) {
|
||||
return b.store.ListSysUser(ctx)
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -87,6 +96,22 @@ func (b *userBiz) Get(ctx context.Context, id int32) (*db.SysUser, error) {
|
||||
return b.store.GetSysUser(ctx, id)
|
||||
}
|
||||
|
||||
func (b *userBiz) XmSelect(ctx context.Context) ([]*view.XmSelect, error) {
|
||||
all, err := b.store.ListSysUser(ctx)
|
||||
if err != nil || len(all) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var res []*view.XmSelect
|
||||
for _, user := range all {
|
||||
res = append(res, &view.XmSelect{
|
||||
Name: user.Username,
|
||||
Value: strconv.Itoa(int(user.ID)),
|
||||
})
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (b *userBiz) Login(ctx context.Context, req *req.Login) error {
|
||||
log := &db.CreateSysUserLoginLogParams{
|
||||
CreatedAt: time.Now(),
|
||||
|
||||
Reference in New Issue
Block a user