repo增加count方法

修改before remove的监听器返回值类型

src/gaea.app/src/main/kotlin/com/synebula/gaea/app/IApplication.kt

@@ -27,7 +27,7 @@ interface IApplication {
             logger?.debug(this, "$name business execute success")
         } catch (ex: Exception) {
             msg.status = Status.Error
-            msg.message = if (error.isEmpty()) ex.message ?: "" else error
+            msg.message = if (error.isEmpty()) ex.message ?: "" else "$error: ${ex.message}"
             logger?.error(this, ex, "$error: ${ex.message}")
         }
         return msg

src/gaea.app/src/main/kotlin/com/synebula/gaea/app/cmd/ICommandApp.kt

@@ -35,7 +35,7 @@ interface ICommandApp<TCommand : ICommand, TKey> : IApplication {
 
     @DeleteMapping("/{id:.+}")
     fun remove(@PathVariable id: TKey): HttpMessage {
-        return this.safeExecute("删除${this.name}失败[id: $id]") {
+        return this.safeExecute("删除${this.name}[id: $id]失败") {
             if (this.service != null)
                 it.data = this.service!!.remove(id)
             else {

src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/repository/MongoRepository.kt

@@ -2,8 +2,10 @@ package com.synebula.gaea.mongo.repository
 
 import com.synebula.gaea.domain.model.IAggregateRoot
 import com.synebula.gaea.domain.repository.IRepository
+import com.synebula.gaea.mongo.where
 import com.synebula.gaea.mongo.whereId
 import org.springframework.data.mongodb.core.MongoTemplate
+import org.springframework.data.mongodb.core.query.Query
 
 /**
  * 实现ITypedRepository的mongo仓储类
@@ -32,4 +34,10 @@ open class MongoRepository(private var repo: MongoTemplate) : IRepository {
     override fun <TAggregateRoot : IAggregateRoot<TKey>, TKey> add(obj: TAggregateRoot, clazz: Class<TAggregateRoot>) {
         this.repo.save(obj)
     }
+
+
+    override fun <TAggregateRoot> count(params: Map<String, Any>?, clazz: Class<TAggregateRoot>): Int {
+        val query = Query()
+        return this.repo.count(query.where(params, clazz), clazz).toInt()
+    }
 }

src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/repository/MongoSpecificRepository.kt

@@ -2,8 +2,10 @@ package com.synebula.gaea.mongo.repository
 
 import com.synebula.gaea.domain.model.IAggregateRoot
 import com.synebula.gaea.domain.repository.ISpecificRepository
+import com.synebula.gaea.mongo.where
 import com.synebula.gaea.mongo.whereId
 import org.springframework.data.mongodb.core.MongoTemplate
+import org.springframework.data.mongodb.core.query.Query
 
 /**
  * 实现IAggregateRoot的mongo仓储类
@@ -48,4 +50,10 @@ class MongoSpecificRepository<TAggregateRoot : IAggregateRoot<String>>(private v
     ): TAggregateRoot {
         return this.repo.findOne(whereId(id.toString()), clazz) as TAggregateRoot
     }
+
+
+    override fun <TAggregateRoot> count(params: Map<String, Any>?): Int {
+        val query = Query()
+        return this.repo.count(query.where(params, this.clazz!!), this.clazz!!).toInt()
+    }
 }

src/gaea/src/main/kotlin/com/synebula/gaea/data/message/Status.kt

@@ -4,15 +4,15 @@ object Status {
     /**
      * 成功
      */
-    val Success = 200
+    const val Success = 200
 
     /**
      * 失败
      */
-    val Failure = 400
+    const val Failure = 400
 
     /**
      * 错误
      */
-    val Error = 500
+    const val Error = 500
 }

src/gaea/src/main/kotlin/com/synebula/gaea/domain/repository/IRepository.kt

@@ -39,4 +39,13 @@ interface IRepository {
      * @return 聚合根
      */
     fun <TAggregateRoot : IAggregateRoot<TKey>, TKey> get(id: TKey, clazz: Class<TAggregateRoot>): TAggregateRoot
+
+
+    /**
+     * 根据条件查询符合条件记录的数量
+     *
+     * @param params 查询条件。
+     * @return int
+     */
+    fun <TAggregateRoot> count(params: Map<String, Any>?, clazz: Class<TAggregateRoot>): Int
 }

src/gaea/src/main/kotlin/com/synebula/gaea/domain/repository/ISpecificRepository.kt

@@ -58,4 +58,13 @@ interface ISpecificRepository<TAggregateRoot : IAggregateRoot<TKey>, TKey> {
      */
     fun <T : IAggregateRoot<TKey>, TKey> get(id: TKey, clazz: Class<T>): T
 
+
+    /**
+     * 根据条件查询符合条件记录的数量
+     *
+     * @param params 查询条件。
+     * @return int
+     */
+    fun <TAggregateRoot> count(params: Map<String, Any>?): Int
+
 }

src/gaea/src/main/kotlin/com/synebula/gaea/domain/service/IService.kt

@@ -28,7 +28,7 @@ interface IService<TKey> {
      * @param key 监听器标志。
      * @param func 监听方法。
      */
-    fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Boolean)
+    fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Message<String>)
 
     /**
      * 移除一个删除对象前执行监听器。

src/gaea/src/main/kotlin/com/synebula/gaea/domain/service/Service.kt

@@ -29,14 +29,14 @@ open class Service<TAggregateRoot : IAggregateRoot<TKey>, TKey>(
     /**
      * 删除对象前执行监听器。
      */
-    protected val beforeRemoveListeners = mutableMapOf<String, (id: TKey) -> Boolean>()
+    protected val beforeRemoveListeners = mutableMapOf<String, (id: TKey) -> Message<String>>()
 
     /**
      * 添加一个删除对象前执行监听器。
      * @param key 监听器标志。
      * @param func 监听方法。
      */
-    override fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Boolean) {
+    override fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Message<String>) {
         this.beforeRemoveListeners[key] = func
     }
 
@@ -63,13 +63,14 @@ open class Service<TAggregateRoot : IAggregateRoot<TKey>, TKey>(
     }
 
     override fun remove(id: TKey) {
-        var exec = true
         val functions = this.beforeRemoveListeners.values
+        var msg: Message<String>
         for (func in functions) {
-            exec = func(id)
+            msg = func(id)
-            if (!exec) break
+            if (!msg.success) {
+                throw java.lang.RuntimeException(msg.data)
+            }
         }
-        if (exec)
         this.repository.remove(id, this.clazz)
     }
 

src/gaea/src/main/kotlin/com/synebula/gaea/domain/service/SpecificService.kt

@@ -33,14 +33,14 @@ open class SpecificService<TAggregateRoot : IAggregateRoot<TKey>, TKey>(
     /**
      * 删除对象前执行监听器。
      */
-    protected val beforeRemoveListeners = mutableMapOf<String, (id: TKey) -> Boolean>()
+    protected val beforeRemoveListeners = mutableMapOf<String, (id: TKey) -> Message<String>>()
 
     /**
      * 添加一个删除对象前执行监听器。
      * @param key 监听器标志。
      * @param func 监听方法。
      */
-    override  fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Boolean) {
+    override fun addBeforeRemoveListener(key: String, func: (id: TKey) -> Message<String>) {
         this.beforeRemoveListeners[key] = func
     }
 
@@ -67,13 +67,14 @@ open class SpecificService<TAggregateRoot : IAggregateRoot<TKey>, TKey>(
     }
 
     override fun remove(id: TKey) {
-        var exec = true
         val functions = this.beforeRemoveListeners.values
+        var msg: Message<String>
         for (func in functions) {
-            exec = func(id)
+            msg = func(id)
-            if (!exec) break
+            if (!msg.success) {
+                throw java.lang.RuntimeException(msg.data)
+            }
         }
-        if (exec)
         this.repository.remove(id)
     }