|
@@ -26,6 +26,7 @@
|
|
|
|
|
|
package com.persagy.server.services.relation_calc
|
|
|
|
|
|
+import com.persagy.base.extensions.toJson
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.server.Opt
|
|
@@ -1111,63 +1112,142 @@ open class RelationCalcService {
|
|
|
e.printStackTrace()
|
|
|
}
|
|
|
/** 启动计算 ******************************/
|
|
|
-// val result = mapper.calcEq2Sp(projectId)
|
|
|
- var result = 0
|
|
|
+ val result = mapper.calcEq2Sp(projectId)
|
|
|
+// var result = 0
|
|
|
logger.debug("计算结果= ${result}")
|
|
|
|
|
|
var equipment = EquipmentService.select(SFilter.eq("localId", "20.30.40.50.10.0001"), SFilter.contain("bimId", "3353659"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var space = ZoneSpaceBaseService.select(SFilter.eq("localName", "F1-补风机房-01"), SFilter.eq("projectId", projectId)).entity()
|
|
|
- val map = HashMap<String, String>()
|
|
|
+ val list = ArrayList<REq2Sp>()
|
|
|
if (equipment != null && space != null) {
|
|
|
- map.put(equipment.id!!, space.id!!)
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment.id
|
|
|
+ req.id2 = space.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
}
|
|
|
+
|
|
|
var equipment2 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0860"), SFilter.contain("bimId", "3360171"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var space2 = ZoneSpaceBaseService.select(SFilter.eq("localName", "F1-女卫生间-02"), SFilter.eq("projectId", projectId)).entity()
|
|
|
if (equipment2 != null && space2 != null) {
|
|
|
- map.put(equipment2.id!!, space2.id!!)
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment2.id
|
|
|
+ req.id2 = space2.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
if(equipment != null){
|
|
|
- map.put(equipment.id!!, space2.id!!)
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment.id
|
|
|
+ req.id2 = space2.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
var equipment3 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0861"), SFilter.contain("bimId", "3360429"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var equipment4 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0862"), SFilter.contain("bimId", "3360571"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var space3 = ZoneSpaceBaseService.select(SFilter.eq("localName", "F1-卫生间前室-02"), SFilter.eq("projectId", projectId)).entity()
|
|
|
- if (equipment3 != null && space3 != null && equipment4 != null) {
|
|
|
- map.put(equipment3.id!!, space3.id!!)
|
|
|
- map.put(equipment4.id!!, space3.id!!)
|
|
|
+ if (equipment3 != null && space3 != null) {
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment3.id
|
|
|
+ req.id2 = space3.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
if(equipment != null){
|
|
|
- map.put(equipment.id!!, space3.id!!)
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment.id
|
|
|
+ req.id2 = space3.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (equipment4 != null && space3 != null) {
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment4.id
|
|
|
+ req.id2 = space3.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
+ }
|
|
|
+
|
|
|
var equipment5 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0863"), SFilter.contain("bimId", "3360088"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var equipment6 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0864"), SFilter.contain("bimId", "3359745"), SFilter.eq("projectId", projectId)).entity()
|
|
|
var space4 = ZoneSpaceBaseService.select(SFilter.eq("localName", "F1-男卫生间-02"), SFilter.eq("projectId", projectId)).entity()
|
|
|
|
|
|
if (equipment5 != null && space4 != null && equipment6 != null) {
|
|
|
- map.put(equipment5.id!!, space4.id!!)
|
|
|
- map.put(equipment6.id!!, space4.id!!)
|
|
|
+ val req1 = REq2Sp()
|
|
|
+ req1.id1 = equipment5.id
|
|
|
+ req1.id2 = space4.id
|
|
|
+ req1.projectId = projectId
|
|
|
+ req1.sign = 1
|
|
|
+ req1.type = "eq2sp_for"
|
|
|
+ req1.zoneType = "GeneralZone"
|
|
|
+ req1.lastUpdate = Date()
|
|
|
+ list.add(req1)
|
|
|
+ val req2 = REq2Sp()
|
|
|
+ req2.id1 = equipment6.id
|
|
|
+ req2.id2 = space4.id
|
|
|
+ req2.projectId = projectId
|
|
|
+ req2.sign = 1
|
|
|
+ req2.type = "eq2sp_for"
|
|
|
+ req2.zoneType = "GeneralZone"
|
|
|
+ req2.lastUpdate = Date()
|
|
|
+ list.add(req2)
|
|
|
if(equipment != null){
|
|
|
- map.put(equipment.id!!, space4.id!!)
|
|
|
+ val req = REq2Sp()
|
|
|
+ req.id1 = equipment.id
|
|
|
+ req.id2 = space4.id
|
|
|
+ req.projectId = projectId
|
|
|
+ req.sign = 1
|
|
|
+ req.type = "eq2sp_for"
|
|
|
+ req.zoneType = "GeneralZone"
|
|
|
+ req.lastUpdate = Date()
|
|
|
+ list.add(req)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- for ((mapKey, mapValue) in map) {
|
|
|
-// val element = REq2SpService.select(SFilter.eq("id1",mapKey), SFilter.eq("id2",mapValue)).exec()
|
|
|
-// if(element != null && element.size >0){
|
|
|
-// continue
|
|
|
-// }
|
|
|
- val req = REq2Sp()
|
|
|
- req.id1 = mapKey
|
|
|
- req.id2 = mapValue
|
|
|
- req.projectId = projectId
|
|
|
- req.sign = 1
|
|
|
- req.type = "eq2sp_for"
|
|
|
- req.zoneType = "GeneralZone"
|
|
|
- req.lastUpdate = Date()
|
|
|
-
|
|
|
- REq2SpService.replace(req)
|
|
|
+// for (rEq2Sp in list) {
|
|
|
+//
|
|
|
+// }
|
|
|
+//// val element = REq2SpService.select(SFilter.eq("id1",mapKey), SFilter.eq("id2",mapValue)).exec()
|
|
|
+//// if(element != null && element.size >0){
|
|
|
+//// continue
|
|
|
+//// }
|
|
|
+// val req = REq2Sp()
|
|
|
+// req.id1 = mapKey
|
|
|
+// req.id2 = mapValue
|
|
|
+// req.projectId = projectId
|
|
|
+// req.sign = 1
|
|
|
+// req.type = "eq2sp_for"
|
|
|
+// req.zoneType = "GeneralZone"
|
|
|
+// req.lastUpdate = Date()
|
|
|
+ for (rEq2Sp in list) {
|
|
|
+ REq2SpService.replace(rEq2Sp)
|
|
|
}
|
|
|
|
|
|
// Thread.sleep(2000000);
|
|
@@ -1202,24 +1282,24 @@ open class RelationCalcService {
|
|
|
|
|
|
|
|
|
/** 处理关系 */
|
|
|
-// val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId),
|
|
|
-// SFilter.inList("classCode",
|
|
|
-// arrayListOf("ATIO", "VTIO"))).exec()
|
|
|
-// if (equipmentList.size > 0) {
|
|
|
-// var listId = ArrayList<String>()
|
|
|
-// for (equipment in equipmentList) {
|
|
|
-// listId.add(equipment.id!!)
|
|
|
-// }
|
|
|
-// val rEq2SpList = REq2SpService.select(SFilter.eq("projectId", projectId),
|
|
|
-// SFilter.inList("id1", listId)
|
|
|
-// , SFilter.eq("type", "eq2sp_in")).exec()
|
|
|
-// if (rEq2SpList.size > 0) {
|
|
|
-// for (rEq2Sp in rEq2SpList) {
|
|
|
-// rEq2Sp.type = "eq2sp_for"
|
|
|
-// REq2SpService.replace(rEq2Sp)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
+ val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId),
|
|
|
+ SFilter.inList("classCode",
|
|
|
+ arrayListOf("ATIO", "VTIO","ACATFC","ACVTAC"))).exec()
|
|
|
+ if (equipmentList.size > 0) {
|
|
|
+ var listId = ArrayList<String>()
|
|
|
+ for (equipment in equipmentList) {
|
|
|
+ listId.add(equipment.id!!)
|
|
|
+ }
|
|
|
+ val rEq2SpList = REq2SpService.select(SFilter.eq("projectId", projectId),
|
|
|
+ SFilter.inList("id1", listId)
|
|
|
+ , SFilter.eq("type", "eq2sp_in")).exec()
|
|
|
+ if (rEq2SpList.size > 0) {
|
|
|
+ for (rEq2Sp in rEq2SpList) {
|
|
|
+ rEq2Sp.type = "eq2sp_for"
|
|
|
+ REq2SpService.replace(rEq2Sp)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
/** 发送消息 */
|
|
|
rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|