修改函数名

binding/entity_crud/service.go → convenient/entity/service.go

@@ -1,4 +1,4 @@
-package entity_crud
+package entity
 
 import (
 	"git.sxidc.com/go-framework/baize/api"
@@ -14,7 +14,7 @@ import (
 	"reflect"
 )
 
-func CreateEntity(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
+func Create(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (string, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {
@@ -54,7 +54,7 @@ func CreateEntity(tableName string, dbExecutor database.Executor, callbacks *Cal
 	}
 }
 
-func DeleteEntity(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
+func Delete(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {
@@ -85,7 +85,7 @@ func DeleteEntity(tableName string, dbExecutor database.Executor, callbacks *Cal
 	}
 }
 
-func UpdateEntity(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
+func Update(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {
@@ -131,7 +131,7 @@ func UpdateEntity(tableName string, dbExecutor database.Executor, callbacks *Cal
 
 type ConditionFieldCallback func(conditions *sql.Conditions, fieldName string, columnName string, value any) (hasDeal bool)
 
-func QueryEntities[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
+func Query[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (response.InfosData[O], error) {
 		queryDTO, ok := dto.(request.Query)
 		if !ok {
@@ -200,7 +200,7 @@ func QueryEntities[O any](tableName string, dbExecutor database.Executor, callba
 	}
 }
 
-func GetEntityByID[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[O]) binding.ServiceFunc[O] {
+func GetByID[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[O]) binding.ServiceFunc[O] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (O, error) {
 		var outputZero O
 		outputZeroValue := reflect.Zero(reflect.TypeOf(outputZero))
@@ -253,7 +253,7 @@ func GetEntityByID[O any](tableName string, dbExecutor database.Executor, callba
 	}
 }
 
-func CreateEntityTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
+func CreateTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (string, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {
@@ -300,7 +300,7 @@ func CreateEntityTx(tableName string, dbExecutor database.Executor, callbacks *C
 	}
 }
 
-func DeleteEntityTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
+func DeleteTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {
@@ -338,7 +338,7 @@ func DeleteEntityTx(tableName string, dbExecutor database.Executor, callbacks *C
 	}
 }
 
-func UpdateEntityTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
+func UpdateTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
 		e, ok := objects[0].(domain.Entity)
 		if !ok {

binding/entity_crud/service_callbacks.go → convenient/entity/service_callbacks.go

@@ -1,4 +1,4 @@
-package entity_crud
+package entity
 
 import (
 	"git.sxidc.com/go-framework/baize/domain"

binding/entity_crud/simple.go → convenient/entity/simple.go

@@ -1,4 +1,4 @@
-package entity_crud
+package entity
 
 import (
 	"git.sxidc.com/go-framework/baize/binding"
@@ -80,7 +80,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendIDResponse[string],
 			DTO:          crud.CreateDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  CreateEntity(crud.TableName, dbExecutor, crud.CreateCallbacks),
+			ServiceFunc:  Create(crud.TableName, dbExecutor, crud.CreateCallbacks),
 		})
 	} else {
 		binding.PostBind(binder, &binding.SimpleBindItem[string]{
@@ -88,7 +88,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendIDResponse[string],
 			DTO:          crud.CreateDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  CreateEntityTx(crud.TableName, dbExecutor, crud.CreateCallbacks),
+			ServiceFunc:  CreateTx(crud.TableName, dbExecutor, crud.CreateCallbacks),
 		})
 	}
 
@@ -99,7 +99,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendMsgResponse,
 			DTO:          crud.DeleteDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  DeleteEntity(crud.TableName, dbExecutor, crud.DeleteCallbacks),
+			ServiceFunc:  Delete(crud.TableName, dbExecutor, crud.DeleteCallbacks),
 		})
 	} else {
 		binding.DeleteBind(binder, &binding.SimpleBindItem[any]{
@@ -107,7 +107,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendMsgResponse,
 			DTO:          crud.DeleteDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  DeleteEntityTx(crud.TableName, dbExecutor, crud.DeleteCallbacks),
+			ServiceFunc:  DeleteTx(crud.TableName, dbExecutor, crud.DeleteCallbacks),
 		})
 	}
 
@@ -118,7 +118,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendMsgResponse,
 			DTO:          crud.UpdateDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  UpdateEntity(crud.TableName, dbExecutor, crud.UpdateCallbacks),
+			ServiceFunc:  Update(crud.TableName, dbExecutor, crud.UpdateCallbacks),
 		})
 	} else {
 		binding.PutBind(binder, &binding.SimpleBindItem[any]{
@@ -126,7 +126,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 			ResponseFunc: response.SendMsgResponse,
 			DTO:          crud.UpdateDTO,
 			Objects:      []domain.Object{crud.Entity},
-			ServiceFunc:  UpdateEntityTx(crud.TableName, dbExecutor, crud.UpdateCallbacks),
+			ServiceFunc:  UpdateTx(crud.TableName, dbExecutor, crud.UpdateCallbacks),
 		})
 	}
 
@@ -136,7 +136,7 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 		ResponseFunc: response.SendInfosResponse[O],
 		DTO:          crud.QueryDTO,
 		Objects:      []domain.Object{crud.Entity},
-		ServiceFunc:  QueryEntities[O](crud.TableName, dbExecutor, crud.QueryCallbacks, crud.QueryConditionFieldCallback),
+		ServiceFunc:  Query[O](crud.TableName, dbExecutor, crud.QueryCallbacks, crud.QueryConditionFieldCallback),
 	})
 
 	// 通过ID获取
@@ -145,6 +145,6 @@ func (crud *Simple[O]) bind(binder *binding.Binder) {
 		ResponseFunc: response.SendInfoResponse[O],
 		DTO:          crud.GetByIDDTO,
 		Objects:      []domain.Object{crud.Entity},
-		ServiceFunc:  GetEntityByID[O](crud.TableName, dbExecutor, crud.GetByIDCallbacks),
+		ServiceFunc:  GetByID[O](crud.TableName, dbExecutor, crud.GetByIDCallbacks),
 	})
 }

examples/binding/main.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"git.sxidc.com/go-framework/baize"
+	"git.sxidc.com/go-framework/baize/ convenient/entity"
 	"git.sxidc.com/go-framework/baize/application"
 	"git.sxidc.com/go-framework/baize/binding"
-	"git.sxidc.com/go-framework/baize/binding/entity_crud"
 	"git.sxidc.com/go-framework/baize/binding/request"
 	"git.sxidc.com/go-framework/baize/domain"
 	"git.sxidc.com/go-framework/baize/infrastructure"
@@ -146,7 +146,7 @@ func main() {
 		PrefixRouter().
 		RegisterVersionedRouter("v1")
 
-	entity_crud.BindSimple[ClassInfo](app.Binder("v1"), &entity_crud.Simple[ClassInfo]{
+	entity.BindSimple[ClassInfo](app.Binder("v1"), &entity.Simple[ClassInfo]{
 		Entity:         &Class{},
 		TableName:      tableName,
 		DBExecutorType: binding.DBExecutorOperations,

examples/binding_ds/main.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"git.sxidc.com/go-framework/baize"
+	"git.sxidc.com/go-framework/baize/ convenient/entity"
 	"git.sxidc.com/go-framework/baize/application"
 	"git.sxidc.com/go-framework/baize/binding"
-	"git.sxidc.com/go-framework/baize/binding/entity_crud"
 	"git.sxidc.com/go-framework/baize/binding/request"
 	"git.sxidc.com/go-framework/baize/domain"
 	"git.sxidc.com/go-framework/baize/infrastructure"
@@ -101,7 +101,7 @@ func main() {
 		PrefixRouter().
 		RegisterVersionedRouter("v1")
 
-	entity_crud.BindSimple[ClassInfo](app.Binder("v1"), &entity_crud.Simple[ClassInfo]{
+	entity.BindSimple[ClassInfo](app.Binder("v1"), &entity.Simple[ClassInfo]{
 		Entity:         &Class{},
 		TableName:      tableName,
 		DBExecutorType: binding.DBExecutorDataService,