Ver código fonte

**********************************wx*************************
关系添加

weixinVSjinlai 4 anos atrás
pai
commit
7532ba6f2f

+ 3 - 1
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -430,7 +430,9 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 excelImport.javaClass.getDeclaredMethod("${relType}In", String::class.java, String::class.java, String::class.java, String::class.java)
             } else if (relType == "eq2fl" || relType == "pe2fl") {
                 excelImport.javaClass.getDeclaredMethod("${relType}In", String::class.java, String::class.java, String::class.java, String::class.java)
-            } else {
+            } else if (relType == ""){
+
+            } else   {
                 if(zoneType.isNullOrEmpty()) {
                     excelImport.javaClass.getDeclaredMethod(cmd, String::class.java, String::class.java, String::class.java, String::class.java)
                 } else {

+ 28 - 28
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt

@@ -1953,12 +1953,12 @@ class ManualRelationAddService {
             sCreateResponse.message = "添加成功"
             return sCreateResponse
 
-        }else if (relationAddRequest.relType == "ArchForArch_Bd2Bd"||relationAddRequest.relType == "ArchForArch_Bd2Fl"||relationAddRequest.relType == "ArchForArch_Bd2Sh"
-            ||relationAddRequest.relType == "ArchForArch_Bd2Sp"||relationAddRequest.relType == "ArchForArch_Fl2Bd"||relationAddRequest.relType == "ArchForArch_Fl2Fl"
-            ||relationAddRequest.relType == "ArchForArch_Fl2Sh"||relationAddRequest.relType == "ArchForArch_Fl2Sp"||relationAddRequest.relType == "ArchForArch_Sh2Bd"
-                || relationAddRequest.relType == "ArchForArch_Sh2Fl"||relationAddRequest.relType == "ArchForArch_Sh2Sh"||relationAddRequest.relType == "ArchForArch_Sh2Sp"
-                || relationAddRequest.relType == "ArchForArch_Sp2Bd" ||relationAddRequest.relType == "ArchForArch_Sp2Fl"||relationAddRequest.relType == "ArchForArch_Sp2Sh"
-                ||relationAddRequest.relType == "ArchForArch_Sp2Sp"){
+        }else if (relationAddRequest.relType == "Bd2Bd_ArchForArch"||relationAddRequest.relType == "Bd2Fl_ArchForArch"||relationAddRequest.relType == "Bd2Sh_ArchForArch"
+            ||relationAddRequest.relType == "Bd2Sp_ArchForArch"||relationAddRequest.relType == "Fl2Bd_ArchForArch"||relationAddRequest.relType == "Fl2Fl_ArchForArch"
+            ||relationAddRequest.relType == "Fl2Sh_ArchForArch"||relationAddRequest.relType == "Fl2Sp_ArchForArch"||relationAddRequest.relType == "Sh2Bd_ArchForArch"
+                || relationAddRequest.relType == "Sh2Fl_ArchForArch"||relationAddRequest.relType == "Sh2Sh_ArchForArch"||relationAddRequest.relType == "Sh2Sp_ArchForArch"
+                || relationAddRequest.relType == "Sp2Bd_ArchForArch" ||relationAddRequest.relType == "Sp2Fl_ArchForArch"||relationAddRequest.relType == "Sp2Sh_ArchForArch"
+                ||relationAddRequest.relType == "Sp2Sp_ArchForArch"){
 //            val sReplaceBuilder = SReplaceBuilder<RBd2Bd>(SMybatisDao(RBd2Bd::class.java))
 
             if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
@@ -1968,8 +1968,8 @@ class ManualRelationAddService {
                 sCreateResponse.errorType = "1"
                 return sCreateResponse
             }
-            if (relationAddRequest.relType == "ArchForArch_Bd2Bd"||relationAddRequest.relType == "ArchForArch_Bd2Fl"||relationAddRequest.relType == "ArchForArch_Bd2Sh"
-                ||relationAddRequest.relType == "ArchForArch_Bd2Sp"){
+            if (relationAddRequest.relType == "Bd2Bd_ArchForArch"||relationAddRequest.relType == "Bd2Fl_ArchForArch"
+                    ||relationAddRequest.relType == "Bd2Sh_ArchForArch" ||relationAddRequest.relType == "Bd2Sp_ArchForArch"){
                 /** 建筑服务于建筑 */
                 val buildingList = BuildingService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
                 if (buildingList.size<1){
@@ -1988,7 +1988,7 @@ class ManualRelationAddService {
                 }
 
                 val building = buildingList[0]
-                if (relationAddRequest.relType == "ArchForArch_Bd2Bd") {
+                if (relationAddRequest.relType == "Bd2Bd_ArchForArch") {
 
                 for (fromContent in relationAddRequest.fromContent!!){
                     /** 去除主对象空间id */
@@ -2025,7 +2025,7 @@ class ManualRelationAddService {
                     rBd2Bd.sign = 1
                     rBd2BdService.replace(rBd2Bd)
                 }
-                }else if (relationAddRequest.relType == "ArchForArch_Bd2Fl") {
+                }else if (relationAddRequest.relType == "Bd2Fl_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val floorToList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -2063,7 +2063,7 @@ class ManualRelationAddService {
                         rBd2FlService.replace(rBd2Fl)
                     }
 
-                }else if (relationAddRequest.relType =="ArchForArch_Bd2Sh") {
+                }else if (relationAddRequest.relType =="Bd2Sh_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val shaftToList = ShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -2141,8 +2141,8 @@ class ManualRelationAddService {
                         rBd2SpService.replace(rBd2Sp)
                     }
                 }
-            }else if (relationAddRequest.relType == "ArchForArch_Fl2Bd"||relationAddRequest.relType == "ArchForArch_Fl2Fl"
-                ||relationAddRequest.relType == "ArchForArch_Fl2Sh"||relationAddRequest.relType == "ArchForArch_Fl2Sp") {
+            }else if (relationAddRequest.relType == "Fl2Bd_ArchForArch"||relationAddRequest.relType == "Fl2Fl_ArchForArch"
+                ||relationAddRequest.relType == "Fl2Sh_ArchForArch"||relationAddRequest.relType == "Fl2Sp_ArchForArch") {
                 /** 楼层服务 */
                 val floorList = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
                 if (floorList.size<1){
@@ -2160,7 +2160,7 @@ class ManualRelationAddService {
                     return sCreateResponse
                 }
 
-                if (relationAddRequest.relType == "ArchForArch_Fl2Bd") {
+                if (relationAddRequest.relType == "Fl2Bd_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val buildingToList = BuildingService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -2196,7 +2196,7 @@ class ManualRelationAddService {
                         rFl2Bd.sign = 1
                         rFl2BdService.replace(rFl2Bd)
                     }
-                } else if (relationAddRequest.relType == "ArchForArch_Fl2Fl") {
+                } else if (relationAddRequest.relType == "Fl2Fl_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val floorToList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -2232,7 +2232,7 @@ class ManualRelationAddService {
                         rFl2Fl.sign = 1
                         rFl2FlService.replace(rFl2Fl)
                     }
-                } else if (relationAddRequest.relType == "ArchForArch_Fl2Sh") {
+                } else if (relationAddRequest.relType == "Fl2Sh_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val shaftToList = ShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -2269,7 +2269,7 @@ class ManualRelationAddService {
                         rFl2Sh.graphCode = relationAddRequest.graphicType
                         rFl2ShService.replace(rFl2Sh)
                     }
-                }else if (relationAddRequest.relType == "ArchForArch_Fl2Sp") {
+                }else if (relationAddRequest.relType == "Fl2Sp_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val spaceToList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2309,8 +2309,8 @@ class ManualRelationAddService {
                     }
                 }
 
-            }else if (relationAddRequest.relType == "ArchForArch_Sh2Bd"|| relationAddRequest.relType == "ArchForArch_Sh2Fl"||
-                relationAddRequest.relType == "ArchForArch_Sh2Sh"||relationAddRequest.relType == "ArchForArch_Sh2Sp") {
+            }else if (relationAddRequest.relType == "Sh2Bd_ArchForArch"|| relationAddRequest.relType == "Sh2Fl_ArchForArch"||
+                relationAddRequest.relType == "Sh2Sh_ArchForArch"||relationAddRequest.relType == "Sh2Sp_ArchForArch") {
                 /** 楼层服务 */
                 val shaftList = ShaftService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
                 if (shaftList.size<1){
@@ -2327,7 +2327,7 @@ class ManualRelationAddService {
                     sCreateResponse.errorType = "1"
                     return sCreateResponse
                 }
-                if (relationAddRequest.relType == "ArchForArch_Sh2Bd"){
+                if (relationAddRequest.relType == "Sh2Bd_ArchForArch"){
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val buildingToList = BuildingService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2363,7 +2363,7 @@ class ManualRelationAddService {
                         rSh2Bd.sign = 1
                         rSh2BdService.replace(rSh2Bd)
                     }
-                }else if (relationAddRequest.relType == "ArchForArch_Sh2Fl"){
+                }else if (relationAddRequest.relType == "Sh2Fl_ArchForArch"){
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val floorToList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2399,7 +2399,7 @@ class ManualRelationAddService {
                         rSh2Fl.sign = 1
                         rSh2FlService.replace(rSh2Fl)
                     }
-                }else if (relationAddRequest.relType == "ArchForArch_Sh2Sh"){
+                }else if (relationAddRequest.relType == "Sh2Sh_ArchForArch"){
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val shaftToList = ShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2436,7 +2436,7 @@ class ManualRelationAddService {
                         rSh2Sh.graphCode = relationAddRequest.graphicType
                         rSh2ShService.replace(rSh2Sh)
                     }
-                }else if (relationAddRequest.relType == "ArchForArch_Sh2Sp"){
+                }else if (relationAddRequest.relType == "Sh2Sp_ArchForArch"){
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val spaceToList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2475,8 +2475,8 @@ class ManualRelationAddService {
                         rSh2SpService.replace(rSh2Sp)
                     }
                 }
-            }else if(relationAddRequest.relType == "ArchForArch_Sp2Bd" ||relationAddRequest.relType == "ArchForArch_Sp2Fl"
-                    ||relationAddRequest.relType == "ArchForArch_Sp2Sh"||relationAddRequest.relType == "ArchForArch_Sp2Sp") {
+            }else if(relationAddRequest.relType == "Sp2Bd_ArchForArch" ||relationAddRequest.relType == "Sp2Fl_ArchForArch"
+                    ||relationAddRequest.relType == "Sp2Sh_ArchForArch"||relationAddRequest.relType == "Sp2Sp_ArchForArch") {
 
                 /** 楼层服务 */
                 val zoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
@@ -2494,7 +2494,7 @@ class ManualRelationAddService {
                     sCreateResponse.errorType = "1"
                     return sCreateResponse
                 }
-                if (relationAddRequest.relType == "ArchForArch_Sp2Sp") {
+                if (relationAddRequest.relType == "Sp2Sp_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val spaceToList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2532,7 +2532,7 @@ class ManualRelationAddService {
                         rSp2SpService.replace(rSp2Sp)
                     }
 
-                }else if (relationAddRequest.relType == "ArchForArch_Sp2Bd") {
+                }else if (relationAddRequest.relType == "Sp2Bd_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val buildingToList = BuildingService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
@@ -2569,7 +2569,7 @@ class ManualRelationAddService {
                         rSp2Bd.zoneType = zoneSpaceList[0].classCode
                         rSp2BdService.replace(rSp2Bd)
                     }
-                }else if (relationAddRequest.relType == "ArchForArch_Sp2Fl") {
+                }else if (relationAddRequest.relType == "Sp2Fl_ArchForArchSp2Fl") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val floorToList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()

+ 1 - 1
gradle.properties

@@ -26,7 +26,7 @@
 
 PERSAGY_URL = http://www.persagy.cn
 PERSAGY_KOTLIN_VERSION = 1.4.121
-PERSAGY_SERVICE_VERSION = 1.4.164
+PERSAGY_SERVICE_VERSION = 1.4.163
 
 #PERSAGY_KOTLIN_VERSION = 1.4.128
 #PERSAGY_SERVICE_VERSION = 1.4.165