From 8729724ed80987f1471f046d2ec8cc29da86fa06 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Fri, 22 May 2020 22:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../synebula/gaea/mongo/query/MongoGenericQuery.kt | 12 ++++++------
 .../com/synebula/gaea/mongo/query/MongoQuery.kt    | 14 ++++++--------
 .../com/synebula/gaea/query/IGenericQuery.kt       |  4 ++--
 .../main/kotlin/com/synebula/gaea/query/IQuery.kt  |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
index 5826adc..4eef9f2 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
@@ -96,17 +96,17 @@ open class MongoGenericQuery<TView>(var template: MongoTemplate, var logger: ILo
         } else 0
     }
 
-    override fun paging(params: PagingParam): PagingData<TView> {
+    override fun paging(param: PagingParam): PagingData<TView> {
         this.check()
         return if (this.clazz != null) {
             val query = Query()
             val fields = this.clazz!!.fields()
-            val result = PagingData<TView>(params.page, params.size)
-            query.where(params.parameters, this.clazz!!)
-            result.total = this.count(params.parameters)
+            val result = PagingData<TView>(param.page, param.size)
+            result.total = this.count(param.parameters)
+            query.where(param.parameters, this.clazz!!)
             query.select(fields.toTypedArray())
-            query.with(order(params.orderBy))
-            query.skip(params.index).limit(params.size)
+            query.with(order(param.orderBy))
+            query.skip(param.index).limit(param.size)
             result.data = this.template.find(query, this.clazz!!, this.collection)
             result
         } else PagingData(1, 10)
diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
index f1dec2f..3300ead 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
@@ -47,17 +47,15 @@ open class MongoQuery(var repo: MongoTemplate, var logger: ILogger? = null) : IQ
         return this.repo.count(query.where(params, clazz), this.collection(clazz)).toInt()
     }
 
-    override fun <TView> paging(params: PagingParam, clazz: Class<TView>): PagingData<TView> {
+    override fun <TView> paging(param: PagingParam, clazz: Class<TView>): PagingData<TView> {
         val fields = clazz.fields()
-        val result = PagingData<TView>(1, 10)
-        result.size = params.size
-        result.page = params.page
+        val result = PagingData<TView>(param.page, param.size)
+        result.total = this.count(param.parameters, clazz)
         val query = Query()
-        query.where(params.parameters, clazz)
-        result.total = this.count(params.parameters, clazz)
+        query.where(param.parameters, clazz)
         query.select(fields.toTypedArray())
-        query.with(order(params.orderBy))
-        query.skip(params.index).limit(params.size)
+        query.with(order(param.orderBy))
+        query.skip(param.index).limit(param.size)
         result.data = this.repo.find(query, clazz, this.collection(clazz))
         return result
     }
diff --git a/src/gaea/src/main/kotlin/com/synebula/gaea/query/IGenericQuery.kt b/src/gaea/src/main/kotlin/com/synebula/gaea/query/IGenericQuery.kt
index 1900e13..83b4abb 100644
--- a/src/gaea/src/main/kotlin/com/synebula/gaea/query/IGenericQuery.kt
+++ b/src/gaea/src/main/kotlin/com/synebula/gaea/query/IGenericQuery.kt
@@ -35,8 +35,8 @@ interface IGenericQuery<TView, TKey> {
     /**
      * 根据实体类条件查询所有符合条件记录（分页查询）
      *
-     * @param params 分页条件
+     * @param param 分页条件
      * @return 分页数据
      */
-    fun paging(params: PagingParam): PagingData<TView>
+    fun paging(param: PagingParam): PagingData<TView>
 }
diff --git a/src/gaea/src/main/kotlin/com/synebula/gaea/query/IQuery.kt b/src/gaea/src/main/kotlin/com/synebula/gaea/query/IQuery.kt
index 96dcbb9..42d7a88 100644
--- a/src/gaea/src/main/kotlin/com/synebula/gaea/query/IQuery.kt
+++ b/src/gaea/src/main/kotlin/com/synebula/gaea/query/IQuery.kt
@@ -33,8 +33,8 @@ interface IQuery {
     /**
      * 根据实体类条件查询所有符合条件记录（分页查询）
      *
-     * @param params 分页条件
+     * @param param 分页条件
      * @return 分页数据
      */
-    fun <TView> paging(params: PagingParam, clazz: Class<TView>): PagingData<TView>
+    fun <TView> paging(param: PagingParam, clazz: Class<TView>): PagingData<TView>
 }