Browse Source

重构领域对象接口

yjp 1 year ago
parent
commit
c0e2e4998e

+ 1 - 1
convenient/binding/bind_item.go

@@ -127,7 +127,7 @@ func (item *BindItem[O]) bind(binder *Binder, middlewares ...api.Handler) {
 							return
 						}
 
-						obj := reflect.New(reflectutils.PointerTypeElem(objectType)).Interface()
+						obj := reflect.New(reflectutils.PointerTypeElem(objectType)).Interface().(domain.Object)
 
 						if params != nil {
 							err := request.AssignRequestParamsToDomainObject(params, obj)

+ 1 - 1
convenient/relation/one2many/service.go

@@ -279,7 +279,7 @@ func QueryRight[LI any](rightTableName string, rightRelationFieldName string, le
 			return outputZero, err
 		}
 
-		existRightEntity := reflect.New(reflect.TypeOf(object).Elem()).Interface()
+		existRightEntity := reflect.New(reflect.TypeOf(object).Elem()).Interface().(domain.Object)
 		err = sql.ParseSqlResult(existRightResult, existRightEntity)
 		if err != nil {
 			return outputZero, err

+ 2 - 2
convenient/relation/one2one/service.go

@@ -55,7 +55,7 @@ func Update(fromTableName string, fromRelationFieldName string, fromRelationColu
 			return nil, fserr.New("关联字段" + fromRelationFieldName + "不存在")
 		}
 
-		existFrom := reflect.New(reflect.TypeOf(object).Elem()).Interface()
+		existFrom := reflect.New(reflect.TypeOf(object).Elem()).Interface().(domain.Object)
 		err = sql.ParseSqlResult(fromResult, existFrom)
 		if err != nil {
 			return nil, err
@@ -159,7 +159,7 @@ func Query[TI any](fromTableName string, fromRelationFieldName string, toTableNa
 			return outputZero, err
 		}
 
-		existFromEntity := reflect.New(reflect.TypeOf(object).Elem()).Interface()
+		existFromEntity := reflect.New(reflect.TypeOf(object).Elem()).Interface().(domain.Object)
 		err = sql.ParseSqlResult(existFromResult, existFromEntity)
 		if err != nil {
 			return outputZero, err

+ 0 - 3
framwork/domain/entity/entity.go

@@ -6,9 +6,6 @@ import (
 
 type Entity interface {
 	domain.Object
-	DBSchema() string
-	DomainCNName() string
-	DomainCamelName() string
 	GenerateID() error
 	GetID() string
 	CheckFieldID(domainCNName string) error

+ 5 - 1
framwork/domain/object.go

@@ -6,7 +6,11 @@ import (
 	"reflect"
 )
 
-type Object interface{}
+type Object interface {
+	DBSchema() string
+	DomainCNName() string
+	DomainCamelName() string
+}
 
 func HasField(object Object, fieldName string) bool {
 	return hasField(object, fieldName)

+ 0 - 3
framwork/domain/value_object/value_object.go

@@ -4,9 +4,6 @@ import "git.sxidc.com/go-framework/baize/framwork/domain"
 
 type ValueObject interface {
 	domain.Object
-	DBSchema() string
-	DomainCNName() string
-	DomainCamelName() string
 	CheckKeyFields() error
 	ForCreate() error
 }