|
@@ -1122,6 +1122,9 @@ open class RelationCalcService {
|
|
|
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!!)
|
|
|
+ if(equipment != null){
|
|
|
+ map.put(equipment.id!!, space2.id!!)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
var equipment3 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0861"), SFilter.contain("bimId", "3360429"), SFilter.eq("projectId", projectId)).entity()
|
|
@@ -1130,6 +1133,9 @@ open class RelationCalcService {
|
|
|
if (equipment3 != null && space3 != null && equipment4 != null) {
|
|
|
map.put(equipment3.id!!, space3.id!!)
|
|
|
map.put(equipment4.id!!, space3.id!!)
|
|
|
+ if(equipment != null){
|
|
|
+ map.put(equipment.id!!, space3.id!!)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
var equipment5 = EquipmentService.select(SFilter.eq("localId", "20.30.30.30.10.10.0863"), SFilter.contain("bimId", "3360088"), SFilter.eq("projectId", projectId)).entity()
|
|
@@ -1139,9 +1145,16 @@ open class RelationCalcService {
|
|
|
if (equipment5 != null && space4 != null && equipment6 != null) {
|
|
|
map.put(equipment5.id!!, space4.id!!)
|
|
|
map.put(equipment6.id!!, space4.id!!)
|
|
|
+ if(equipment != null){
|
|
|
+ map.put(equipment.id!!, space4.id!!)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
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
|
|
@@ -1149,6 +1162,8 @@ open class RelationCalcService {
|
|
|
req.sign = 1
|
|
|
req.type = "eq2sp_for"
|
|
|
req.zoneType = "GeneralZone"
|
|
|
+
|
|
|
+
|
|
|
REq2SpService.insert(req)
|
|
|
}
|
|
|
|