Pārlūkot izejas kodu

**********************************wx*************************
表格导入

weixinVSjinlai 4 gadi atpakaļ
vecāks
revīzija
a9b02a5024

+ 12 - 12
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 == "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"){
+        }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 == "Bd2Bd_ArchForArch"||relationAddRequest.relType == "Bd2Fl_ArchForArch"
-                    ||relationAddRequest.relType == "Bd2Sh_ArchForArch" ||relationAddRequest.relType == "Bd2Sp_ArchForArch"){
+            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 == "Bd2Bd_ArchForArch") {
+                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 == "Bd2Fl_ArchForArch") {
+                }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 =="Bd2Sh_ArchForArch") {
+                }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()
@@ -2101,7 +2101,7 @@ class ManualRelationAddService {
 //                        rRBd2BdService.replace(rBd2Bd,sReplaceBuilder)
                         rBd2ShService.replace(rBd2Sh)
                     }
-                }else if (relationAddRequest.relType =="ArchForArch_Bd2Sp") {
+                }else if (relationAddRequest.relType =="bd2sp_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val spaceToList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()

+ 8 - 267
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -253,12 +253,12 @@ open class ManualRelationCalcService {
      */
     fun delRel(manualRelationCalcDel: ManualRelationCalcDel):SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!manualRelationCalcDel.fromId.isNullOrEmpty()&&!manualRelationCalcDel.toId.isNullOrEmpty()){
 
                 try {
                     val relationTypeProjectService = SObjectService(SMybatisDao(RelationTypeProject::class.java))
-                    val relationType = relationTypeProjectService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("RelationType", manualRelationCalcDel.relType!!)).entity()
+                    val relationType = relationTypeProjectService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("relationType", manualRelationCalcDel.relType!!)).entity()
                     if (relationType!=null){
                         relationType.computingTime = time()
                         relationTypeProjectService.update(relationType)
@@ -517,274 +517,15 @@ open class ManualRelationCalcService {
                 }else if (manualRelationCalcDel.relType ==  "eq2sp_x"){
                     delete = rEq2SpService.delete(SFilter.eq("projectId", projectId!!),
                         SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }
+                }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"){
 
-                if (delete){
-                    return SBaseResponse(SResponseType.success)
-                }else{
-                    return  SBaseResponse(SResponseType.failure)
                 }
-            }else if(!manualRelationCalcDel.fromId.isNullOrEmpty()&&manualRelationCalcDel.toId.isNullOrEmpty()){
 
-                try {
-                    val relationTypeProjectService = SObjectService(SMybatisDao(RelationTypeProject::class.java))
-                    val relationType = relationTypeProjectService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("RelationType", manualRelationCalcDel.relType!!)).entity()
-                    if (relationType!=null){
-                        relationType.computingTime = time()
-                        relationTypeProjectService.update(relationType)
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-                var delete = false
-                if (manualRelationCalcDel.relType == "pe2sp"){ /** 资产所在的业务空间 */
-                    delete = rPeInSpBaseService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "pe2sh"){/** 资产所在竖井 */
-                    delete = rPeInShService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("equipId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "eq2sh_for"){/** 设备服务于竖井 */
-                    delete = rEq2ShService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("equipId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "eq2fl_for"){/** 设备服务于楼层 */
-                    delete =  rEq2FlService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("equipId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType =="eq2bd_for"){/** 设备服务于建筑 */
-                    delete = REqForBdService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("equipId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "sy2sp_for") {/** 系统服务于业务空间 */
-                    delete = rSy2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sy2sh_for"){
-                    /** 系统服务于竖井 */
-                    delete = rSy2ShService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("sysId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "sy2fl_for"){
-                    /** 系统服务于楼层 */
-                    delete = RSyForFlService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("sysId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "sy2bd_for"){
-                    delete = rSy2BdService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("sysId", manualRelationCalcDel.fromId!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_ConvectionNetwork_1"){
-                    /** 空间 空气自然对流 */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_ConvectionNetwork_2"){
-                    /** 空间空气混合机械通风  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_ConvectionNetwork_3"){
-                    /** 空气单向机械通风 */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_SpaceNeighborhood_5"){
-                    /** 空间连通关系  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_SpaceNeighborhood_2"){
-                    /** 空间隔断有门  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_SpaceNeighborhood_4"){
-                    /** 空间隔断有门窗  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_TrafficNetwork_3"){
-                    /** 空间消防常关交通  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_TrafficNetwork_2"){
-                    /** 空间消防常开交通  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_RadiationNetwork_1"){
-                    /** 空间光照连通  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_RadiationNetwork_2"){
-                    /** 空间光照透明隔断  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_SpaceNeighborhood_1"){
-                    /** 空间隔断无门窗  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_TrafficNetwork_1"){
-                    /** 空间普通交通  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "sp2sp_SpaceNeighborhood_3"){
-                    /** 空间隔断有窗  */
-                    delete = rSp2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HUDistribution_1"){ /** 高压变配电普通连接 */
-                    /** 强电类 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HUDistribution_2"){/** 高压变配电互备连接 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_LUDistribution_1"){/** 低压配电普通连接 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_LUDistribution_2"){/** 低压配电互备连接 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_EquipPower_1"){/** 设备常规电源 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_EquipPower_2"){/** 设备备用电源 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_EquipPower_3"){/** 系统常规电源 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_EquipPower_4"){/** 系统备用电源 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ACAirNetwork_1"){ /** 空调送风 */
-                    /** 暖通空调类 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ACAirNetwork_3"){/** 空调排风 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ACAirNetwork_2"){/** 空调回风 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ChillWaterLoop_4"){/** 空调冷冻水补水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ChillWaterLoop_1"){/** 空调冷冻水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ChillWaterLoop_3"){/** 空调冷冻水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ChillWaterLoop_2"){/**  空调冷冻水回水*/
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_CondWaterNetwork_1"){/** 空调冷凝水网络 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_CoolingWaterLoop_4"){/** 空调冷却水补水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_CoolingWaterLoop_1"){/** 空调冷却水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_CoolingWaterLoop_3"){/** 空调冷却水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_CoolingWaterLoop_2"){/** 空调冷却水回水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eqFreshAirNetwork_1"){/** 新风管网 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HeatWaterLoop_4"){/** 采暖水回水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HeatWaterLoop_1"){/** 采暖水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HeatWaterLoop_3"){/** 采暖水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_HeatWaterLoop_2"){/** 采暖水回水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_VentNetwork_1"){/** 通风送风 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_VentNetwork_3"){/** 通风不确定 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_VentNetwork_2"){/** 通风排风 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_VRFNetwork_1"){/** 多联机供回制冷剂 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_SupplyWaterNetwork_1"){ /** 生活给水供水 */
-                    /** 给排水类  */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_SupplyWaterNetwork_2"){/** 生活给水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DrainingWaterNetwork_1"){/** 污水排水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DrainingWaterNetwork_2"){/** 污水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DrinkingWaterNetwork_1"){/** 直饮水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DrinkingWaterNetwork_2"){/** 直饮水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DHWNetwork_1"){/** 生活热水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_DHWNetwork_2"){/** 生活热水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_GasNetwork_1"){/** 燃气供气 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_GasNetwork_2"){/** 燃气旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_FireWaterNetwork_1"){/** 消防供水网络 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_FireWaterNetwork_2"){/** 消防给水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_FireVentNetwork_1"){/** 消防排烟 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_RecycleWaterNetwork_1"){/** 中水供水 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_RecycleWaterNetwork_2"){/** 中水旁通 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_SensorNetwork_1"){ /** 通信连接 */
-                    /** 测控类 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if(manualRelationCalcDel.relType == "eq2eq_ControlEquipNetwork"){
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ControlRelation_1"){/** 设备控制关系 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_SensorRelationship_ss2eq"){/** 传感器测量设备关系 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
-                    delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ControlRelation_2"){ /** 系统控制关系 */
-                    delete = rEq2SyService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */
-                    delete = rEq2SyService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2sy_ValveRelationship_vv2sy"){ /** 阀门限制系统关系 */
-                    delete = rEq2SyService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType ==  "eq2sp_SensorRelationship_ss2sp"){/** 传感器测量空间关系 */
-                    delete = rEq2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2sp_x"){
-                    delete = rEq2SpService.delete(SFilter.eq("projectId", projectId!!),
-                        SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }
                 if (delete){
                     return SBaseResponse(SResponseType.success)
                 }else{