black1552
/
gin-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 36 Wiki Activity

refactor(curd): 修改关联查询参数类型支持预加载函数配置 

- 将 ClearFieldPage 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 ClearFieldList 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 ClearFieldOne 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 FindPri 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 First 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 All 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 将 Paginate 方法的 with 参数从 string 类型改为 map[string]func(db gorm.PreloadBuilder) error 类型
- 修改所有方法中的关联查询逻辑，从单一字符串预加载改为循环遍历预加载函数映射
- 更新参数验证条件，从判断字符串非空改为判断映射不为nil
main
black1552 2026-03-05 09:47:46 +08:00
parent 5581041da4
commit 1a33330214
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/GOHCache.xml
View File

@ -242,7 +242,7 @@
<entry key="file://$PROJECT_DIR$/crud/curd.go"> <entry key="file://$PROJECT_DIR$/crud/curd.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1772608170073" /> <option name="lastModified" value="1772675013830" />
<option name="schema"> <option name="schema">
<list> <list>
<option value="Paginate" /> <option value="Paginate" />
@ -465,7 +465,7 @@
<entry key="file://$PROJECT_DIR$/../gin_test/controller/home/index.go"> <entry key="file://$PROJECT_DIR$/../gin_test/controller/home/index.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1772606534126" /> <option name="lastModified" value="1772608689818" />
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>

57
crud/curd.go
View File

@ -212,14 +212,17 @@ func (c Crud[R]) ClearField(req any, delField []string, subField ...map[string]a
} }
// ClearFieldPage -------------------------- 原ClearFieldPage对应实现：清理参数+分页查询 -------------------------- // ClearFieldPage -------------------------- 原ClearFieldPage对应实现：清理参数+分页查询 --------------------------
func (c Crud[R]) ClearFieldPage(ctx ctx, req any, delField []string, where any, page *Paginate, order any, with string) (items []*R, total int64, err error) { func (c Crud[R]) ClearFieldPage(ctx ctx, req any, delField []string, where any, page *Paginate, order any, with map[string]func(db gorm.PreloadBuilder) error) (items []*R, total int64, err error) {
// 1. 清理请求参数 // 1. 清理请求参数
filterMap := c.ClearField(req, delField) filterMap := c.ClearField(req, delField)
// 2. 初始化GORM查询 // 2. 初始化GORM查询
db := c.Dao.Ctx(ctx) db := c.Dao.Ctx(ctx)
if with != "" {
db = db.Preload(with) // GORM 关联查询全部，对应GF的WithAll() if with != nil {
for k, v := range with {
db = db.Preload(k, v)
}
} }
// 3. 构建查询条件 // 3. 构建查询条件
@ -250,12 +253,14 @@ func (c Crud[R]) ClearFieldPage(ctx ctx, req any, delField []string, where any,
} }
// ClearFieldList -------------------------- 原ClearFieldList对应实现：清理参数+列表查询（不分页） -------------------------- // ClearFieldList -------------------------- 原ClearFieldList对应实现：清理参数+列表查询（不分页） --------------------------
func (c Crud[R]) ClearFieldList(ctx ctx, req any, delField []string, where any, order any, with string) (items []*R, err error) { func (c Crud[R]) ClearFieldList(ctx ctx, req any, delField []string, where any, order any, with map[string]func(db gorm.PreloadBuilder) error) (items []*R, err error) {
filterMap := c.ClearField(req, delField) filterMap := c.ClearField(req, delField)
db := c.Dao.Ctx(ctx).Model(new(R)) db := c.Dao.Ctx(ctx).Model(new(R))
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
if where != nil { if where != nil {
db = db.Where(where) db = db.Where(where)
@ -269,13 +274,15 @@ func (c Crud[R]) ClearFieldList(ctx ctx, req any, delField []string, where any,
} }
// ClearFieldOne -------------------------- 原ClearFieldOne对应实现：清理参数+单条查询 -------------------------- // ClearFieldOne -------------------------- 原ClearFieldOne对应实现：清理参数+单条查询 --------------------------
func (c Crud[R]) ClearFieldOne(ctx ctx, req any, delField []string, where any, order any, with string) (item *R, err error) { func (c Crud[R]) ClearFieldOne(ctx ctx, req any, delField []string, where any, order any, with map[string]func(db gorm.PreloadBuilder) error) (item *R, err error) {
item = new(R) item = new(R)
filterMap := c.ClearField(req, delField) filterMap := c.ClearField(req, delField)
db := c.Dao.Ctx(ctx).Model(item) db := c.Dao.Ctx(ctx).Model(item)
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
if where != nil { if where != nil {
db = db.Where(where) db = db.Where(where)
@ -371,7 +378,7 @@ func (c Crud[R]) ArrayField(ctx ctx, where any, field any) []interface{} {
} }
// FindPri -------------------------- 原FindPri对应实现：按主键查询单条记录 -------------------------- // FindPri -------------------------- 原FindPri对应实现：按主键查询单条记录 --------------------------
func (c Crud[R]) FindPri(ctx ctx, primaryKey any, with string) (model *R) { func (c Crud[R]) FindPri(ctx ctx, primaryKey any, with map[string]func(db gorm.PreloadBuilder) error) (model *R) {
model = new(R) model = new(R)
db := c.Dao.Ctx(ctx).Model(model) db := c.Dao.Ctx(ctx).Model(model)
pk := c.Dao.PrimaryKey() pk := c.Dao.PrimaryKey()
@ -379,8 +386,10 @@ func (c Crud[R]) FindPri(ctx ctx, primaryKey any, with string) (model *R) {
if pk == "" { if pk == "" {
panic("主键字段未配置") panic("主键字段未配置")
} }
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
// 按主键查询 // 按主键查询
@ -392,12 +401,14 @@ func (c Crud[R]) FindPri(ctx ctx, primaryKey any, with string) (model *R) {
} }
// -------------------------- 原First对应实现：按条件查询第一条记录 -------------------------- // -------------------------- 原First对应实现：按条件查询第一条记录 --------------------------
func (c Crud[R]) First(ctx ctx, where any, order any, with string) (model *R) { func (c Crud[R]) First(ctx ctx, where any, order any, with map[string]func(db gorm.PreloadBuilder) error) (model *R) {
model = new(R) model = new(R)
db := c.Dao.Ctx(ctx).Model(model) db := c.Dao.Ctx(ctx).Model(model)
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
if where != nil { if where != nil {
db = db.Where(where) db = db.Where(where)
@ -424,11 +435,13 @@ func (c Crud[R]) Exists(ctx ctx, where any) (exists bool) {
} }
// -------------------------- 原All对应实现：查询所有符合条件的记录 -------------------------- // -------------------------- 原All对应实现：查询所有符合条件的记录 --------------------------
func (c Crud[R]) All(ctx ctx, where any, order any, with string) (items []*R) { func (c Crud[R]) All(ctx ctx, where any, order any, with map[string]func(db gorm.PreloadBuilder) error) (items []*R) {
db := c.Dao.Ctx(ctx).Model(new(R)) db := c.Dao.Ctx(ctx).Model(new(R))
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
if where != nil { if where != nil {
db = db.Where(where) db = db.Where(where)
@ -487,7 +500,7 @@ func (c Crud[R]) UpdatePri(ctx ctx, primaryKey any, data any) (count int64) {
} }
// -------------------------- 原Paginate对应实现：分页查询 -------------------------- // -------------------------- 原Paginate对应实现：分页查询 --------------------------
func (c Crud[R]) Paginate(ctx context.Context, where any, p Paginate, with string, order any) (items []*R, total int64) { func (c Crud[R]) Paginate(ctx context.Context, where any, p Paginate, with map[string]func(db gorm.PreloadBuilder) error, order any) (items []*R, total int64) {
db := c.Dao.Ctx(ctx).Model(new(R)) db := c.Dao.Ctx(ctx).Model(new(R))
// 1. 构建查询条件 // 1. 构建查询条件
@ -501,8 +514,10 @@ func (c Crud[R]) Paginate(ctx context.Context, where any, p Paginate, with strin
} }
// 3. 关联查询 // 3. 关联查询
if with != "" { if with != nil {
db = db.Preload(with) for k, v := range with {
db = db.Preload(k, v)
}
} }
// 4. 排序 // 4. 排序