From 50dd55df2b4813fdf581b348509ca67190ad1813 Mon Sep 17 00:00:00 2001
From: jaysunxiao <jaysunxiao@gmail.com>
Date: Tue, 28 Jun 2022 18:05:35 +0800
Subject: [PATCH] =?UTF-8?q?ref[orm]:=20=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E4=BA=86IQueryBuilder=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zfoo/orm/model/cache/EntityCaches.java    |  2 +-
 .../zfoo/orm/model/query/IQueryBuilder.java   |  6 ++---
 .../orm/model/query/MongoQueryBuilder.java    | 22 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java b/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java
index 42dedb23..8fbd9275 100644
--- a/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java
+++ b/orm/src/main/java/com/zfoo/orm/model/cache/EntityCaches.java
@@ -241,7 +241,7 @@ public class EntityCaches<PK extends Comparable<PK>, E extends IEntity<PK>> impl
         var ids = updateList.stream().map(it -> it.id()).collect(Collectors.toList());
 
         try {
-            List<IEntity> dbList = OrmContext.getQuery(entityDef.getClazz()).in("_id", ids).queryAll();
+            var dbList = OrmContext.getQuery((Class<E>)entityDef.getClazz()).in("_id", ids).queryAll();
             var dbMap = dbList.stream().collect(Collectors.toMap(key -> key.id(), value -> value));
             for (var entity : updateList) {
                 var dbEntity = dbMap.get(entity.id());
diff --git a/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java
index ed987981..85546100 100644
--- a/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java
+++ b/orm/src/main/java/com/zfoo/orm/model/query/IQueryBuilder.java
@@ -54,8 +54,6 @@ public interface IQueryBuilder<E extends IEntity> {
 
     List<E> queryAll();
 
-    E find();
-
 
     /**
      * 分页查询，默认按照id排序
@@ -63,5 +61,7 @@ public interface IQueryBuilder<E extends IEntity> {
      * @param page         第几页
      * @param itemsPerPage 每页容量
      */
-    Pair<Page, List<E>> page(int page, int itemsPerPage);
+    Pair<Page, List<E>> queryPage(int page, int itemsPerPage);
+
+    E queryFirst();
 }
diff --git a/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java
index 347ab23f..46c504ea 100644
--- a/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java
+++ b/orm/src/main/java/com/zfoo/orm/model/query/MongoQueryBuilder.java
@@ -120,17 +120,7 @@ public class MongoQueryBuilder<E extends IEntity<?>> implements IQueryBuilder<E>
     }
 
     @Override
-    public E find() {
-        var collection = OrmContext.getOrmManager().getCollection(entity);
-        var list = builder != null ? collection.find(builder) : collection.find();
-        for (E row : list) {
-            return row;
-        }
-        return null;
-    }
-
-    @Override
-    public Pair<Page, List<E>> page(int page, int itemsPerPage) {
+    public Pair<Page, List<E>> queryPage(int page, int itemsPerPage) {
         var collection = OrmContext.getOrmManager().getCollection(entity);
 
         var p = Page.valueOf(page, itemsPerPage, collection.countDocuments());
@@ -148,4 +138,14 @@ public class MongoQueryBuilder<E extends IEntity<?>> implements IQueryBuilder<E>
 
         return new Pair<>(p, list);
     }
+
+    @Override
+    public E queryFirst() {
+        var collection = OrmContext.getOrmManager().getCollection(entity);
+        var list = builder != null ? collection.find(builder) : collection.find();
+        for (E row : list) {
+            return row;
+        }
+        return null;
+    }
 }