Browse Source

优化实体映射

zhouhao 3 years ago
parent
commit
8efd19e65d

+ 2 - 2
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DefaultEntityResultWrapperFactory.java

@@ -5,6 +5,7 @@ import lombok.SneakyThrows;
 import org.hswebframework.ezorm.rdb.executor.wrapper.ResultWrapper;
 import org.hswebframework.ezorm.rdb.mapping.EntityManager;
 import org.hswebframework.ezorm.rdb.mapping.wrapper.EntityResultWrapper;
+import org.hswebframework.ezorm.rdb.mapping.wrapper.NestedEntityResultWrapper;
 
 @AllArgsConstructor
 public class DefaultEntityResultWrapperFactory implements EntityResultWrapperFactory {
@@ -14,8 +15,7 @@ public class DefaultEntityResultWrapperFactory implements EntityResultWrapperFac
     @Override
     @SneakyThrows
     public <T> ResultWrapper<T, ?> getWrapper(Class<T> tClass) {
-        return new EntityResultWrapper<>(() -> entityManager.newInstance(tClass),
-                entityManager.getMapping(tClass));
+        return new NestedEntityResultWrapper<>(entityManager.getMapping(tClass));
 
     }
 }

+ 6 - 0
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/DetectEntityColumnMapping.java

@@ -3,6 +3,7 @@ package org.hswebframework.web.crud.configuration;
 import org.hswebframework.ezorm.rdb.mapping.EntityColumnMapping;
 import org.hswebframework.ezorm.rdb.mapping.MappingFeatureType;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
+import org.hswebframework.ezorm.rdb.metadata.TableOrViewMetadata;
 
 import java.util.Map;
 import java.util.Optional;
@@ -44,6 +45,11 @@ class DetectEntityColumnMapping implements EntityColumnMapping {
         return mapping.getColumnPropertyMapping();
     }
 
+    @Override
+    public TableOrViewMetadata getTable() {
+        return mapping.getTable();
+    }
+
     @Override
     public String getId() {
         return id;