|
@@ -253,7 +253,7 @@ open class ManualRelationCalcService {
|
|
|
*/
|
|
|
fun addRel(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse{
|
|
|
/** 项目id */
|
|
|
- val projectId = SPageContext.getHeader("ProjectId")
|
|
|
+ val projectId = SPageContext.getHeader("projectId")
|
|
|
|
|
|
val sCreateResponse = ManualRelationCalcSCreateResponse()
|
|
|
|
|
@@ -1246,7 +1246,11 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.sign = 1
|
|
|
rEq2Eq.type = "eq2eq_HUDistribution_1"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
- rEq2EqService.replace(rEq2Eq)
|
|
|
+ val replace = rEq2EqService.replace(rEq2Eq)
|
|
|
+ if (replace) {
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HUDistribution_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
+ }
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_HUDistribution_2"){/** 高压变配电互备连接 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1256,7 +1260,11 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.sign = 1
|
|
|
rEq2Eq.type = "eq2eq_HUDistribution_2"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
- rEq2EqService.replace(rEq2Eq)
|
|
|
+ val replace = rEq2EqService.replace(rEq2Eq)
|
|
|
+ if (replace) {
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HUDistribution_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
+ }
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_LUDistribution_1"){/** 低压配电普通连接 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1266,7 +1274,12 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.sign = 1
|
|
|
rEq2Eq.type = "eq2eq_LUDistribution_1"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
- rEq2EqService.replace(rEq2Eq)
|
|
|
+ val replace = rEq2EqService.replace(rEq2Eq)
|
|
|
+ if (replace) {
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_LUDistribution_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_LUDistribution_2"){/** 低压配电互备连接 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1277,6 +1290,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.type = "eq2eq_LUDistribution_2"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_LUDistribution_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_EquipPower_1"){/** 设备常规电源 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1287,6 +1302,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.type = "eq2eq_EquipPower_1"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_EquipPower_2"){/** 设备备用电源 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1297,6 +1314,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.type = "eq2eq_EquipPower_2"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_EquipPower_3"){/** 系统常规电源 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1307,6 +1326,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.type = "eq2eq_EquipPower_3"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_EquipPower_4"){/** 系统备用电源 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1317,6 +1338,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.type = "eq2eq_EquipPower_4"
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}
|
|
|
sCreateResponse.result = SResponseType.success
|
|
@@ -1382,6 +1405,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ACAirNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ACAirNetwork_3"){/** 空调排风 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1392,6 +1417,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ACAirNetwork_3"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ACAirNetwork_2"){/** 空调回风 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1402,6 +1429,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ACAirNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_4"){/** 空调冷冻水补水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1412,6 +1441,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ChillWaterLoop_4"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_1"){/** 空调冷冻水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1422,6 +1453,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ChillWaterLoop_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_3"){/** 空调冷冻水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1432,6 +1465,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ChillWaterLoop_3"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_2"){/** 空调冷冻水回水*/
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1442,6 +1477,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ChillWaterLoop_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_CondWaterNetwork_1"){/** 空调冷凝水网络 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1452,6 +1489,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_CondWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CondWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_4"){/** 空调冷却水补水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1462,6 +1501,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_CoolingWaterLoop_4"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_1"){/** 空调冷却水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1472,6 +1513,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_CoolingWaterLoop_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_3"){/** 空调冷却水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1482,6 +1525,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_CoolingWaterLoop_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_2"){/** 空调冷却水回水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1492,6 +1537,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_CoolingWaterLoop_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eqFreshAirNetwork_1"){/** 新风管网 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1502,6 +1549,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eqFreshAirNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eqFreshAirNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_4"){/** 采暖水回水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1512,6 +1561,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_HeatWaterLoop_4"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_1"){/** 采暖水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1522,6 +1573,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_HeatWaterLoop_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_3"){/** 采暖水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1532,6 +1585,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_HeatWaterLoop_3"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_2"){/** 采暖水回水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1542,6 +1597,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_HeatWaterLoop_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_VentNetwork_1"){/** 通风送风 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1552,6 +1609,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_VentNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_VentNetwork_3"){/** 通风不确定 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1562,6 +1621,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_VentNetwork_3"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_VentNetwork_2"){/** 通风排风 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1572,6 +1633,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_VentNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_VRFNetwork_1"){/** 多联机供回制冷剂 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1582,6 +1645,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_VRFNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VRFNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1647,6 +1712,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_SupplyWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SupplyWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_SupplyWaterNetwork_2"){/** 生活给水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1657,6 +1724,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_SupplyWaterNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SupplyWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DrainingWaterNetwork_1"){/** 污水排水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1667,6 +1736,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DrainingWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrainingWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DrainingWaterNetwork_2"){/** 污水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1677,6 +1748,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DrainingWaterNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrainingWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DrinkingWaterNetwork_1"){/** 直饮水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1687,6 +1760,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DrinkingWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrinkingWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DrinkingWaterNetwork_2"){/** 直饮水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1697,6 +1772,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DrinkingWaterNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrinkingWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DHWNetwork_1"){/** 生活热水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1707,6 +1784,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DHWNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DHWNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_DHWNetwork_2"){/** 生活热水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1717,6 +1796,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_DHWNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DHWNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_GasNetwork_1"){/** 燃气供气 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1727,6 +1808,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_GasNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_GasNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_GasNetwork_2"){/** 燃气旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1737,6 +1820,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_GasNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_GasNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_FireWaterNetwork_1"){/** 消防供水网络 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1747,6 +1832,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_FireWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_FireWaterNetwork_2"){/** 消防给水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1757,6 +1844,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_FireWaterNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_FireVentNetwork_1"){/** 消防排烟 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1767,6 +1856,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_FireVentNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireVentNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_RecycleWaterNetwork_1"){/** 中水供水 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1777,6 +1868,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_RecycleWaterNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_RecycleWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_RecycleWaterNetwork_2"){/** 中水旁通 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1787,6 +1880,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_RecycleWaterNetwork_2"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_RecycleWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1851,6 +1946,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ControlEquipNetwork"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlEquipNetwork","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_SensorNetwork_1"){ /** 通信连接 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1861,6 +1958,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_SensorNetwork_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ControlRelation_1"){/** 设备控制关系 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1871,6 +1970,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ControlRelation_1"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlRelation_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_SensorRelationship_ss2eq"){/** 传感器测量设备关系 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1881,6 +1982,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_SensorRelationship_ss2eq"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1891,6 +1994,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Eq.id2 = equipmentTo.id
|
|
|
rEq2Eq.type = "eq2eq_ValveRelationship_vv2eq"
|
|
|
rEq2EqService.replace(rEq2Eq)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ValveRelationship_vv2eq","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
|
|
|
}
|
|
|
}
|
|
|
sCreateResponse.result = SResponseType.success
|
|
@@ -1957,6 +2062,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Sy.id2 = equipmentTo.id
|
|
|
rEq2Sy.type = "eq2eq_ControlRelation_2"
|
|
|
rEq2SyService.replace(rEq2Sy)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlRelation_2","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1967,6 +2074,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Sy.id2 = equipmentTo.id
|
|
|
rEq2Sy.type = "eq2sy_SensorRelationship_ss2sy"
|
|
|
rEq2SyService.replace(rEq2Sy)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_SensorRelationship_ss2sy","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
|
|
|
}
|
|
|
}else if (relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){ /** 阀门限制系统关系 */
|
|
|
for (equipmentTo in equipmentToList) {
|
|
@@ -1977,6 +2086,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Sy.id2 = equipmentTo.id
|
|
|
rEq2Sy.type = "eq2sy_ValveRelationship_vv2sy"
|
|
|
rEq2SyService.replace(rEq2Sy)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_ValveRelationship_vv2sy","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2045,6 +2156,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Sp.zoneType = equipmentTo.classCode
|
|
|
rEq2Sp.type = "eq2sp_SensorRelationship_ss2sp"
|
|
|
rEq2SpService.replace(rEq2Sp)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2sp_SensorRelationship_ss2sp","11", rEq2Sp.id1!!,rEq2Sp.id2!!)
|
|
|
}
|
|
|
sCreateResponse.result = SResponseType.success
|
|
|
sCreateResponse.message = "添加成功"
|
|
@@ -2111,6 +2224,8 @@ open class ManualRelationCalcService {
|
|
|
rEq2Sp.zoneType = equipmentTo.classCode
|
|
|
rEq2Sp.type = "eq2sp_x"
|
|
|
rEq2SpService.replace(rEq2Sp)
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "eq2sp_x","11", rEq2Sp.id1!!,rEq2Sp.id2!!)
|
|
|
}
|
|
|
sCreateResponse.result = SResponseType.success
|
|
|
sCreateResponse.message = "添加成功"
|
|
@@ -2128,7 +2243,7 @@ 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 {
|
|
@@ -2143,6 +2258,7 @@ open class ManualRelationCalcService {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
var delete: Boolean = false
|
|
|
if (manualRelationCalcDel.relType == "pe2sp"){ /** 资产所在的业务空间 */
|
|
|
delete = rPeInSpBaseService.delete(SFilter.eq("projectId", projectId!!),
|
|
@@ -2395,6 +2511,10 @@ open class ManualRelationCalcService {
|
|
|
}
|
|
|
|
|
|
if (delete){
|
|
|
+ if (manualRelationCalcDel.relType != "pe2sp"&&manualRelationCalcDel.relType != "pe2sh"){
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, manualRelationCalcDel.relType!!,"12",manualRelationCalcDel.fromId!!,manualRelationCalcDel.toId!!)
|
|
|
+ }
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
}else{
|
|
|
return SBaseResponse(SResponseType.failure)
|
|
@@ -2661,6 +2781,10 @@ open class ManualRelationCalcService {
|
|
|
SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
|
|
|
}
|
|
|
if (delete){
|
|
|
+ if (manualRelationCalcDel.relType != "pe2sp"&&manualRelationCalcDel.relType != "pe2sh"){
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, manualRelationCalcDel.relType!!,"15",manualRelationCalcDel.fromId!!,"123456")
|
|
|
+ }
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
}else{
|
|
|
return SBaseResponse(SResponseType.failure)
|