Browse Source

简化接口

yjp 1 year ago
parent
commit
02132af8df

+ 3 - 3
convenient/entity_crud/service.go

@@ -254,7 +254,7 @@ func GetByID[O any](tableName string, callbacks *Callbacks[O]) binding.ServiceFu
 			return outputZero, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID(e.DomainCNName())
+		err := e.CheckFieldID()
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, outputZero)
 		}
@@ -359,7 +359,7 @@ func DeleteTx(tableName string, callbacks *Callbacks[any]) binding.ServiceFunc[a
 			return nil, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID(e.DomainCNName())
+		err := e.CheckFieldID()
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, nil)
 		}
@@ -404,7 +404,7 @@ func UpdateTx(tableName string, callbacks *Callbacks[any]) binding.ServiceFunc[a
 			return nil, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID(e.DomainCNName())
+		err := e.CheckFieldID()
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, nil)
 		}

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

@@ -31,7 +31,7 @@ func Update(middleTableName string,
 		}
 
 		// 字段校验
-		err := fromEntity.CheckFieldID(fromEntity.DomainCNName())
+		err := fromEntity.CheckFieldID()
 		if err != nil {
 			return nil, err
 		}

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

@@ -34,7 +34,7 @@ func UpdateLeft(leftTableName string, leftDomainCNName string, leftRelationField
 		}
 
 		// 字段校验
-		err := leftEntity.CheckFieldID(leftEntity.DomainCNName())
+		err := leftEntity.CheckFieldID()
 		if err != nil {
 			return nil, err
 		}
@@ -196,7 +196,7 @@ func UpdateRight(rightTableName string, rightRelationFieldName string, rightRela
 		}
 
 		// 字段校验
-		err := rightEntity.CheckFieldID(rightEntity.DomainCNName())
+		err := rightEntity.CheckFieldID()
 		if err != nil {
 			return nil, err
 		}

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

@@ -33,7 +33,7 @@ func Update(fromTableName string, fromRelationFieldName string, fromRelationColu
 		}
 
 		// 字段校验
-		err := fromEntity.CheckFieldID(fromEntity.DomainCNName())
+		err := fromEntity.CheckFieldID()
 		if err != nil {
 			return nil, err
 		}

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

@@ -31,7 +31,7 @@ func Update(middleTableName string,
 		}
 
 		// 字段校验
-		err := fromEntity.CheckFieldID(fromEntity.DomainCNName())
+		err := fromEntity.CheckFieldID()
 		if err != nil {
 			return nil, err
 		}

+ 7 - 3
examples/examples/project/application/domain/class/entity.go

@@ -31,8 +31,12 @@ func (e *Entity) DomainCamelName() string {
 	return "Class"
 }
 
+func (e *Entity) CheckFieldID() error {
+	return e.Base.CheckFieldID(e.DomainCNName())
+}
+
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}
@@ -46,11 +50,11 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForDelete() error {
-	return e.CheckFieldID(e.DomainCNName())
+	return e.CheckFieldID()
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}

+ 7 - 3
examples/examples/project/application/domain/family/entity.go

@@ -32,8 +32,12 @@ func (e *Entity) DomainCamelName() string {
 	return "Family"
 }
 
+func (e *Entity) CheckFieldID() error {
+	return e.Base.CheckFieldID(e.DomainCNName())
+}
+
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}
@@ -47,11 +51,11 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForDelete() error {
-	return e.CheckFieldID(e.DomainCNName())
+	return e.CheckFieldID()
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}

+ 5 - 5
examples/examples/project/application/domain/hobby/entity.go

@@ -23,8 +23,8 @@ func (e *Entity) GetID() string {
 	return e.ID
 }
 
-func (e *Entity) CheckFieldID(domainCNName string) error {
-	return entity.CheckID(domainCNName, "ID", e.ID)
+func (e *Entity) CheckFieldID() error {
+	return entity.CheckID(e.DomainCNName(), "ID", e.ID)
 }
 
 func (e *Entity) DomainCNName() string {
@@ -36,7 +36,7 @@ func (e *Entity) DomainCamelName() string {
 }
 
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}
@@ -45,11 +45,11 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForDelete() error {
-	return e.CheckFieldID(e.DomainCNName())
+	return e.CheckFieldID()
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}

+ 7 - 3
examples/examples/project/application/domain/identity/entity.go

@@ -29,8 +29,12 @@ func (e *Entity) DomainCamelName() string {
 	return "Identity"
 }
 
+func (e *Entity) CheckFieldID() error {
+	return e.Base.CheckFieldID(e.DomainCNName())
+}
+
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}
@@ -44,11 +48,11 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForDelete() error {
-	return e.CheckFieldID(e.DomainCNName())
+	return e.CheckFieldID()
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}

+ 7 - 3
examples/examples/project/application/domain/student/entity.go

@@ -32,8 +32,12 @@ func (e *Entity) DomainCamelName() string {
 	return "Student"
 }
 
+func (e *Entity) CheckFieldID() error {
+	return e.Base.CheckFieldID(e.DomainCNName())
+}
+
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}
@@ -47,11 +51,11 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForDelete() error {
-	return e.CheckFieldID(e.DomainCNName())
+	return e.CheckFieldID()
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID(e.DomainCNName())
+	err := e.CheckFieldID()
 	if err != nil {
 		return err
 	}

+ 1 - 1
framwork/domain/entity/entity.go

@@ -8,7 +8,7 @@ type Entity interface {
 	domain.Object
 	GenerateID() error
 	GetID() string
-	CheckFieldID(domainCNName string) error
+	CheckFieldID() error
 	ForCreate() error
 	ForDelete() error
 	ForUpdate() error