Jelajahi Sumber

变更sybotan为saga.

sybotan 5 tahun lalu
induk
melakukan
550f8c2bac

+ 2 - 2
gradle.properties

@@ -22,8 +22,8 @@
 #
 
 SAGA_URL = http://www.sagacloud.cn
-SAGA_KOTLIN_VERSION = 1.4.93
-SAGA_SERVICE_VERSION = 1.4.137
+SAGA_KOTLIN_VERSION = 1.4.94
+SAGA_SERVICE_VERSION = 1.4.138
 
 MAVEN_REPO_PUBLIC_URL = http://dev.dp.sagacloud.cn:8082/repository/maven-public/
 MAVEN_REPO_RELEASE_URL = http://dev.dp.sagacloud.cn:8082/repository/maven-releases/

+ 2 - 2
saga-service-base/src/main/kotlin/com/sybotan/service/SBaseService.kt

@@ -437,7 +437,7 @@ open class SBaseService<ENTITY: Any> {
         }
 
         val idList = entityIdList(entityMap)
-        val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, idList)
+        val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, cascadeAnno.filter, idList)
         // 如果未取到关联数据,则开始取下一个关联对象
         if (relationList.size <= 0) {
             return
@@ -523,7 +523,7 @@ open class SBaseService<ENTITY: Any> {
      */
     private fun cascadeCount(entityMap: HashMap<Any, Any>, cascadeAnno: SCascadeCount, cascadeField: Field, cascade: SCascadeQuery) {
         val idList = entityIdList(entityMap)
-        val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, idList)
+        val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, cascadeAnno.filter, idList)
         // 如果未取到关联数据,则开始取下一个关联对象
         if (relationList.size <= 0) {
             return

+ 3 - 1
saga-service-models/src/main/kotlin/com/sybotan/service/models/annotations/SCascade.kt

@@ -41,5 +41,7 @@ annotation class SCascade (
         /** 子对象ID名称 */
         val childIdColumn: String,
         /** 关联自身(比如楼层连通关系,两个ID都是楼层) */
-        val self: Boolean = false
+        val self: Boolean = false,
+        /** 过滤条件 */
+        val filter: String = ""
 ) // Annotation SCascade

+ 3 - 1
saga-service-models/src/main/kotlin/com/sybotan/service/models/annotations/SCascadeCount.kt

@@ -44,5 +44,7 @@ annotation class SCascadeCount (
         /** 子对象ID名称 */
         val childIdColumn: String,
         /** 关联自身(比如楼层连通关系,两个ID都是楼层) */
-        val self: Boolean = false
+        val self: Boolean = false,
+        /** 过滤条件 */
+        val filter: String = ""
 ) // Annotation SCascade

+ 0 - 36
saga-service-models/src/main/kotlin/com/sybotan/service/models/annotations/SJoin.kt

@@ -1,36 +0,0 @@
-/*
- * ********************************************************************************************************************
- *
- *               iFHS7.
- *              ;BBMBMBMc                  rZMBMBR              BMB
- *              MBEr:;PBM,               7MBMMEOBB:             BBB                       RBW
- *     XK:      BO     SB.     :SZ       MBM.       c;;     ir  BBM :FFr       :SSF:    ;xBMB:r   iuGXv.    i:. iF2;
- *     DBBM0r.  :D     S7   ;XMBMB       GMBMu.     MBM:   BMB  MBMBBBMBMS   WMBMBMBBK  MBMBMBM  BMBRBMBW  .MBMBMBMBB
- *      :JMRMMD  ..    ,  1MMRM1;         ;MBMBBR:   MBM  ;MB:  BMB:   MBM. RMBr   sBMH   BM0         UMB,  BMB.  KMBv
- *     ;.   XOW  B1; :uM: 1RE,   i           .2BMBs  rMB. MBO   MBO    JMB; MBB     MBM   BBS    7MBMBOBM:  MBW   :BMc
- *     OBRJ.SEE  MRDOWOR, 3DE:7OBM       .     ;BMB   RMR7BM    BMB    MBB. BMB    ,BMR  .BBZ   MMB   rMB,  BMM   rMB7
- *     :FBRO0D0  RKXSXPR. JOKOOMPi       BMBSSWBMB;    BMBB:    MBMB0ZMBMS  .BMBOXRBMB    MBMDE RBM2;SMBM;  MBB   xBM2
- *         iZGE  O0SHSPO. uGZ7.          sBMBMBDL      :BMO     OZu:BMBK,     rRBMB0;     ,EBMB  xBMBr:ER.  RDU   :OO;
- *     ,BZ, 1D0  RPSFHXR. xWZ .SMr                  . .BBB
- *      :0BMRDG  RESSSKR. 2WOMBW;                   BMBMR
- *         i0BM: SWKHKGO  MBDv
- *           .UB  OOGDM. MK,                                          Copyright (c) 2015-2019.  斯伯坦机器人
- *              ,  XMW  ..
- *                  r                                                                     All rights reserved.
- *
- * ********************************************************************************************************************
- */
-
-package com.sybotan.service.models.annotations
-
-import java.lang.annotation.Inherited
-
-/**
- * 数据库访问框架连接注解
- *
- * @author  庞利祥 <sybotan@126.com>
- */
-@Target(AnnotationTarget.FIELD)
-@MustBeDocumented
-@Inherited
-annotation class SJoin () // Annotation SJoin