From 1670aed4cd86a244cfc5bdcfd37b2d704cfca677 Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Mon, 1 Jul 2024 10:59:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/callback/AssociationWriter.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java index 3518f2a..2077cb1 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java @@ -9,11 +9,9 @@ import com.flyfish.framework.repository.DefaultReactiveRepository; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.data.mapping.PersistentEntity; -import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.data.r2dbc.core.R2dbcEntityOperations; import org.springframework.data.r2dbc.core.StatementMapper; -import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; import org.springframework.data.relational.core.query.Criteria; import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.r2dbc.core.Parameter; @@ -31,19 +29,6 @@ class AssociationWriter implements MetadataHandler { private final Supplier operations; - /** - * 通过持久化属性获取真实的列名 - * - * @param property 属性 - * @return 结果 - */ - private String getColumnName(PersistentProperty property) { - if (property instanceof RelationalPersistentProperty) { - return ((RelationalPersistentProperty) property).getColumnName().getReference(); - } - return property.getName(); - } - /** * 处理association * @@ -182,9 +167,8 @@ class AssociationWriter implements MetadataHandler { */ private Mono execute(DatabaseClient databaseClient, PreparedOperation operation, Domain entity) { return databaseClient.sql(operation) - .map((row -> entity)) - .all() - .defaultIfEmpty(entity) - .last(); + .fetch() + .rowsUpdated() + .thenReturn(entity); } }