|
@@ -2141,8 +2141,8 @@ class ManualRelationAddService {
|
|
|
rBd2SpService.replace(rBd2Sp)
|
|
|
}
|
|
|
}
|
|
|
- }else if (relationAddRequest.relType == "Fl2Bd_ArchForArch"||relationAddRequest.relType == "Fl2Fl_ArchForArch"
|
|
|
- ||relationAddRequest.relType == "Fl2Sh_ArchForArch"||relationAddRequest.relType == "Fl2Sp_ArchForArch") {
|
|
|
+ }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 == "Fl2Bd_ArchForArch") {
|
|
|
+ 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 == "Fl2Fl_ArchForArch") {
|
|
|
+ } 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 == "Fl2Sh_ArchForArch") {
|
|
|
+ } 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 == "Fl2Sp_ArchForArch") {
|
|
|
+ }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 == "Sh2Bd_ArchForArch"|| relationAddRequest.relType == "Sh2Fl_ArchForArch"||
|
|
|
- relationAddRequest.relType == "Sh2Sh_ArchForArch"||relationAddRequest.relType == "Sh2Sp_ArchForArch") {
|
|
|
+ }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 == "Sh2Bd_ArchForArch"){
|
|
|
+ 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 == "Sh2Fl_ArchForArch"){
|
|
|
+ }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 == "Sh2Sh_ArchForArch"){
|
|
|
+ }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 == "Sh2Sp_ArchForArch"){
|
|
|
+ }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 == "Sp2Bd_ArchForArch" ||relationAddRequest.relType == "Sp2Fl_ArchForArch"
|
|
|
- ||relationAddRequest.relType == "Sp2Sh_ArchForArch"||relationAddRequest.relType == "Sp2Sp_ArchForArch") {
|
|
|
+ }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 == "Sp2Sp_ArchForArch") {
|
|
|
+ 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 == "Sp2Bd_ArchForArch") {
|
|
|
+ }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 == "Sp2Fl_ArchForArchSp2Fl") {
|
|
|
+ }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()
|