|
@@ -283,7 +283,7 @@ open class GraphicTypeMapperService {
|
|
||n =="r_fl_through_fl"||n =="zone_space_base"||n =="floor"||n =="equipment"
|
|
||n =="r_fl_through_fl"||n =="zone_space_base"||n =="floor"||n =="equipment"
|
|
||n =="general_system"||n =="r_eq_for_sh"||n =="r_eq_in_sh"
|
|
||n =="general_system"||n =="r_eq_for_sh"||n =="r_eq_in_sh"
|
|
||n =="r_pe_in_sh"||n =="r_eq_for_bd"||n =="property"||n == "r_sp_in_bd"
|
|
||n =="r_pe_in_sh"||n =="r_eq_for_bd"||n =="property"||n == "r_sp_in_bd"
|
|
- ||n =="r_sp_in_fl"){
|
|
|
|
|
|
+ ||n =="r_sp_in_fl"||n =="r_sy_in_bd"){
|
|
count += mapper.relationCount(n, projectId)
|
|
count += mapper.relationCount(n, projectId)
|
|
}else if (n =="r_tn2sp"){
|
|
}else if (n =="r_tn2sp"){
|
|
val exec = rTn2SptService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
val exec = rTn2SptService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
@@ -345,7 +345,10 @@ open class GraphicTypeMapperService {
|
|
}else if (n == "property_bd"){
|
|
}else if (n == "property_bd"){
|
|
val execEquip = PropertyService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
|
|
val execEquip = PropertyService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
|
|
count += execEquip.size
|
|
count += execEquip.size
|
|
- }else if (n == "floor_bd"){
|
|
|
|
|
|
+ }else if (n == "equipmentbd" ){
|
|
|
|
+ val execEquip = EquipmentService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
|
|
|
|
+ count += execEquip.size
|
|
|
|
+ } else if (n == "floor_bd"){
|
|
val execEquip = FloorService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
|
|
val execEquip = FloorService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
|
|
count += execEquip.size
|
|
count += execEquip.size
|
|
}else if (n == "equipment_fl"){
|
|
}else if (n == "equipment_fl"){
|
|
@@ -357,7 +360,14 @@ open class GraphicTypeMapperService {
|
|
val rEq2SyList = rEq2SyService.select(SFilter.eq("projectId", projectId),
|
|
val rEq2SyList = rEq2SyService.select(SFilter.eq("projectId", projectId),
|
|
SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
count += rEq2SyList.size
|
|
count += rEq2SyList.size
|
|
- }else if (!n.isNullOrEmpty()){
|
|
|
|
|
|
+ }else if (n == "relationship.r_sh2sp"){
|
|
|
|
+ try {
|
|
|
|
+ val exec = rSh2SpService.select(SFilter.eq("ProjectId", projectId), SFilter.eq("Type", relationTypeProject.relationType!!),SFilter.eq("zoneType", relationTypeProject.zoneType!!)).exec()
|
|
|
|
+ count += exec.size
|
|
|
|
+ } catch (e: Exception) {
|
|
|
|
+ e.printStackTrace()
|
|
|
|
+ }
|
|
|
|
+ } else if (!n.isNullOrEmpty()){
|
|
if (!relationTypeProject.relationType.isNullOrEmpty()) {
|
|
if (!relationTypeProject.relationType.isNullOrEmpty()) {
|
|
count += mapper.relationCountRelType(n, projectId,relationTypeProject.relationType!!)
|
|
count += mapper.relationCountRelType(n, projectId,relationTypeProject.relationType!!)
|
|
}
|
|
}
|