TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2026-01-06 22:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 数据库表查询支持页数选择

Browse Source
This commit is contained in:
meilin.huang
2023-07-27 16:47:05 +08:00
parent 8f37b71d7f
commit 0f596a712d
11 changed files with 238 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/internal/sys/api/account.go
View File

@@ -9,6 +9,7 @@ import (
"mayfly-go/internal/sys/application"
"mayfly-go/internal/sys/domain/entity"
"mayfly-go/pkg/biz"
"mayfly-go/pkg/contextx"
"mayfly-go/pkg/ginx"
"mayfly-go/pkg/model"
"mayfly-go/pkg/req"
@@ -189,11 +190,8 @@ func (a *Account) AccountResources(rc *req.Ctx) {
// 保存账号角色信息
func (a *Account) SaveRoles(rc *req.Ctx) {
g := rc.GinCtx
var form form.AccountRoleForm
ginx.BindJsonAndValid(g, &form)
aid := uint64(form.Id)
ginx.BindJsonAndValid(rc.GinCtx, &form)
rc.ReqParam = form
// 将,拼接的字符串进行切割并转换
@@ -202,22 +200,7 @@ func (a *Account) SaveRoles(rc *req.Ctx) {
return uint64(id)
})
oIds := a.RoleApp.GetAccountRoleIds(uint64(form.Id))
addIds, delIds, _ := collx.ArrayCompare(newIds, oIds, func(i1, i2 uint64) bool {
return i1 == i2
})
createTime := time.Now()
creator := rc.LoginAccount.Username
creatorId := rc.LoginAccount.Id
for _, v := range addIds {
rr := &entity.AccountRole{AccountId: aid, RoleId: v, CreateTime: &createTime, CreatorId: creatorId, Creator: creator}
a.RoleApp.SaveAccountRole(rr)
}
for _, v := range delIds {
a.RoleApp.DeleteAccountRole(aid, v)
}
a.RoleApp.SaveAccountRole(contextx.NewLoginAccount(rc.LoginAccount), form.Id, newIds)
}
// 重置otp秘钥

4
server/internal/sys/api/form/role.go
View File

@@ -2,7 +2,7 @@ package form
// 分配角色资源表单信息
type RoleResourceForm struct {
Id int `json:"id"`
Id uint64 `json:"id"`
ResourceIds string `json:"resourceIds"`
}
@@ -17,6 +17,6 @@ type RoleForm struct {
// 账号分配角色表单
type AccountRoleForm struct {
Id int `json:"id" binding:"required"`
Id uint64 `json:"id" binding:"required"`
RoleIds string `json:"roleIds"`
}

27
server/internal/sys/api/role.go
View File

@@ -6,13 +6,12 @@ import (
"mayfly-go/internal/sys/application"
"mayfly-go/internal/sys/domain/entity"
"mayfly-go/pkg/biz"
"mayfly-go/pkg/contextx"
"mayfly-go/pkg/ginx"
"mayfly-go/pkg/model"
"mayfly-go/pkg/req"
"mayfly-go/pkg/utils/collx"
"strconv"
"strings"
"time"
)
type Role struct {
@@ -68,7 +67,6 @@ func (r *Role) RoleResource(rc *req.Ctx) {
func (r *Role) SaveResource(rc *req.Ctx) {
var form form.RoleResourceForm
ginx.BindJsonAndValid(rc.GinCtx, &form)
rid := uint64(form.Id)
rc.ReqParam = form
// 将,拼接的字符串进行切割并转换
@@ -77,26 +75,5 @@ func (r *Role) SaveResource(rc *req.Ctx) {
return uint64(id)
})
oIds := r.RoleApp.GetRoleResourceIds(uint64(form.Id))
addIds, delIds, _ := collx.ArrayCompare(newIds, oIds, func(i1, i2 uint64) bool {
return i1 == i2
})
createTime := time.Now()
creator := rc.LoginAccount.Username
creatorId := rc.LoginAccount.Id
undeleted := model.ModelUndeleted
addVals := make([]*entity.RoleResource, 0)
for _, v := range addIds {
rr := &entity.RoleResource{RoleId: rid, ResourceId: v, CreateTime: &createTime, CreatorId: creatorId, Creator: creator}
rr.IsDeleted = undeleted
addVals = append(addVals, rr)
}
r.RoleApp.SaveRoleResource(addVals)
for _, v := range delIds {
r.RoleApp.DeleteRoleResource(rid, v)
}
r.RoleApp.SaveRoleResource(contextx.NewLoginAccount(rc.LoginAccount), form.Id, newIds)
}