|
@@ -35,6 +35,7 @@ import com.persagy.server.datacenter.wanda.rel.REq2Eq
|
|
|
import com.persagy.server.mappers.ICalcSpecialMapper
|
|
|
import com.persagy.server.datacenter.models.entities.Connector
|
|
|
import com.persagy.server.datacenter.models.wrapperobj.ClassCodeEnum
|
|
|
+import com.persagy.server.datacenter.services.objects.BuildingService
|
|
|
import com.persagy.server.datacenter.services.objects.EquipmentService
|
|
|
import com.persagy.server.datacenter.wanda.obj.Equipment
|
|
|
import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
|
|
@@ -255,119 +256,122 @@ open class CalcSpecialService {
|
|
|
* @Param:
|
|
|
* @Return:
|
|
|
*/
|
|
|
- fun calcNetworks(projectId: String,buildingId: String): SBaseResponse{
|
|
|
- val floors = FloorService.select(SFilter.eq("projectId",projectId), SFilter.eq("buildingId",buildingId),SFilter.eq("id","Fl440307000355ee6382da6d42cf87f19551cc4b4e60")).exec()
|
|
|
- val connectedBlocks = ArrayList<ConnectedBlock>()
|
|
|
- for (floor in floors) {
|
|
|
- if (!floor.modelId.isNullOrEmpty()) {
|
|
|
- val connectors = mapper.connectorOrder(floor.modelId!!)
|
|
|
- val dcEquipments = EquipmentService.select(SFilter.eq("projectId",projectId), SFilter.eq("floorId",floor.id!!)).exec()
|
|
|
- val dcEquipMap = HashMap<String, Equipment>(1024)
|
|
|
- for (equipment in dcEquipments) {
|
|
|
- if(!equipment.bimId.isNullOrEmpty()){
|
|
|
- dcEquipMap[equipment.bimId!!] = equipment
|
|
|
+ fun calcNetworks(projectId: String): SBaseResponse{
|
|
|
+ val buildings = BuildingService.select(SFilter.eq("projectId",projectId)).exec()
|
|
|
+ for (building in buildings) {
|
|
|
+ val buildingId = building.id!!
|
|
|
+ val floors = FloorService.select(SFilter.eq("projectId",projectId), SFilter.eq("buildingId",buildingId)).exec()
|
|
|
+ val connectedBlocks = ArrayList<ConnectedBlock>()
|
|
|
+ for (floor in floors) {
|
|
|
+ if (!floor.modelId.isNullOrEmpty()) {
|
|
|
+ val connectors = mapper.connectorOrder(floor.modelId!!)
|
|
|
+ val dcEquipments = EquipmentService.select(SFilter.eq("projectId",projectId), SFilter.eq("floorId",floor.id!!)).exec()
|
|
|
+ val dcEquipMap = HashMap<String, Equipment>(1024)
|
|
|
+ for (equipment in dcEquipments) {
|
|
|
+ if(!equipment.bimId.isNullOrEmpty()){
|
|
|
+ dcEquipMap[equipment.bimId!!] = equipment
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ val connectorMap = HashMap<String, Connector>(100000)
|
|
|
+ val typeMap = HashMap<String, String>(20000)
|
|
|
+ for (connector in connectors) {
|
|
|
+ connectorMap[connector.revitId!!] = connector
|
|
|
|
|
|
- val connectorMap = HashMap<String, Connector>(100000)
|
|
|
- val typeMap = HashMap<String, String>(20000)
|
|
|
- for (connector in connectors) {
|
|
|
- connectorMap[connector.revitId!!] = connector
|
|
|
+ val belong = connector.belongBimId ?: continue
|
|
|
+ val belongType = connector.belongType
|
|
|
+ if (belongType != null) {
|
|
|
+ typeMap[belong] = belongType
|
|
|
+ }
|
|
|
|
|
|
- val belong = connector.belongBimId ?: continue
|
|
|
- val belongType = connector.belongType
|
|
|
- if (belongType != null) {
|
|
|
- typeMap[belong] = belongType
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- val belongMap = HashMap<String, HashSet<String>>()
|
|
|
- val eqBelongSet = HashSet<String>()
|
|
|
- //遍历连接件
|
|
|
- for (connector in connectors) {
|
|
|
- //拿到所属类
|
|
|
- val belongType = connector.belongType
|
|
|
- //拿到所属id
|
|
|
- val belong = connector.belongBimId
|
|
|
- if(belong != null){
|
|
|
- eqBelongSet.add(belong)
|
|
|
- //如果连接件有连接
|
|
|
- if (connector.connectedIds!!.size > 0) {
|
|
|
- val revitId = connector!!.connectedIds?.get(0)
|
|
|
- var currentConnector = connectorMap[revitId!!]
|
|
|
- val cBelong = currentConnector?.belongBimId
|
|
|
- if (cBelong != null) {
|
|
|
+ val belongMap = HashMap<String, HashSet<String>>()
|
|
|
+ val eqBelongSet = HashSet<String>()
|
|
|
+ //遍历连接件
|
|
|
+ for (connector in connectors) {
|
|
|
+ //拿到所属类
|
|
|
+ val belongType = connector.belongType
|
|
|
+ //拿到所属id
|
|
|
+ val belong = connector.belongBimId
|
|
|
+ if(belong != null){
|
|
|
+ eqBelongSet.add(belong)
|
|
|
+ //如果连接件有连接
|
|
|
+ if (connector.connectedIds!!.size > 0) {
|
|
|
+ val revitId = connector!!.connectedIds?.get(0)
|
|
|
+ var currentConnector = connectorMap[revitId!!]
|
|
|
+ val cBelong = currentConnector?.belongBimId
|
|
|
+ if (cBelong != null) {
|
|
|
// if(belongType == "Equipment"){
|
|
|
// eqBelongSet.add(belong)
|
|
|
// }
|
|
|
|
|
|
- if (belongMap.containsKey(belong)) {
|
|
|
- val belongs = belongMap[belong]!!
|
|
|
- belongs.add(cBelong)
|
|
|
- belongMap[belong] = belongs
|
|
|
- } else {
|
|
|
- belongMap[belong] = hashSetOf(cBelong)
|
|
|
+ if (belongMap.containsKey(belong)) {
|
|
|
+ val belongs = belongMap[belong]!!
|
|
|
+ belongs.add(cBelong)
|
|
|
+ belongMap[belong] = belongs
|
|
|
+ } else {
|
|
|
+ belongMap[belong] = hashSetOf(cBelong)
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ belongMap[belong] = HashSet()
|
|
|
}
|
|
|
- }else{
|
|
|
+ }else {
|
|
|
belongMap[belong] = HashSet()
|
|
|
}
|
|
|
- }else {
|
|
|
- belongMap[belong] = HashSet()
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- var fBlockId: Int =0
|
|
|
- var dBlockId: Int =0
|
|
|
- var cBlockId = 0
|
|
|
- val fBlockMap = HashMap<Int,HashSet<String>>()
|
|
|
+ var fBlockId: Int =0
|
|
|
+ var dBlockId: Int =0
|
|
|
+ var cBlockId = 0
|
|
|
+ val fBlockMap = HashMap<Int,HashSet<String>>()
|
|
|
// val dBlockMap = HashMap<Int,HashSet<String>>()
|
|
|
- val enumList = ClassCodeEnum.toSourceList(null)
|
|
|
- var fSet: HashSet<String>? = null
|
|
|
- var dSet: HashSet<String>
|
|
|
- println(eqBelongSet.size)
|
|
|
- for (key in eqBelongSet) {
|
|
|
- val e1 = dcEquipMap[key]
|
|
|
- if(e1 == null || !enumList.contains(e1.classCode)){
|
|
|
- continue
|
|
|
- }
|
|
|
+ val enumList = ClassCodeEnum.toSourceList(null)
|
|
|
+ var fSet: HashSet<String>? = null
|
|
|
+ var dSet: HashSet<String>
|
|
|
+ println(eqBelongSet.size)
|
|
|
+ for (key in eqBelongSet) {
|
|
|
+ val e1 = dcEquipMap[key]
|
|
|
+ if(e1 == null || !enumList.contains(e1.classCode)){
|
|
|
+ continue
|
|
|
+ }
|
|
|
|
|
|
- val belongSet = belongMap[key]!!
|
|
|
+ val belongSet = belongMap[key]!!
|
|
|
|
|
|
- dSet = directDist(HashSet(belongSet),belongMap,typeMap)
|
|
|
- dBlockId ++
|
|
|
+ dSet = directDist(HashSet(belongSet),belongMap,typeMap)
|
|
|
+ dBlockId ++
|
|
|
|
|
|
- for (s in dSet!!) {
|
|
|
- if(typeMap[s] == "Equipment" && key != s){
|
|
|
- val e2 = dcEquipMap[s]
|
|
|
- if(e2 == null || !enumList.contains(e2.classCode)){
|
|
|
- continue
|
|
|
- }
|
|
|
- if(e1.classCode == e2.classCode){
|
|
|
- continue
|
|
|
- }
|
|
|
+ for (s in dSet!!) {
|
|
|
+ if(typeMap[s] == "Equipment" && key != s){
|
|
|
+ val e2 = dcEquipMap[s]
|
|
|
+ if(e2 == null || !enumList.contains(e2.classCode)){
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if(e1.classCode == e2.classCode){
|
|
|
+ continue
|
|
|
+ }
|
|
|
|
|
|
- val connectedBlock = ConnectedBlock()
|
|
|
- connectedBlock.id1 = e1.id!!
|
|
|
- connectedBlock.id2 = e2.id!!
|
|
|
- connectedBlock.type1 = "Equipment"
|
|
|
- connectedBlock.type2 = "Equipment"
|
|
|
- connectedBlock.modelId1 = floor.modelId
|
|
|
- connectedBlock.modelId2 = floor.modelId
|
|
|
+ val connectedBlock = ConnectedBlock()
|
|
|
+ connectedBlock.id1 = e1.id!!
|
|
|
+ connectedBlock.id2 = e2.id!!
|
|
|
+ connectedBlock.type1 = "Equipment"
|
|
|
+ connectedBlock.type2 = "Equipment"
|
|
|
+ connectedBlock.modelId1 = floor.modelId
|
|
|
+ connectedBlock.modelId2 = floor.modelId
|
|
|
// connectedBlock.domain = connector.domain
|
|
|
// connectedBlock.mepSystemType = connector.mepSystemType
|
|
|
- connectedBlock.projectId = projectId
|
|
|
- connectedBlock.buildingId = buildingId
|
|
|
- connectedBlock.depth = 0
|
|
|
- connectedBlock.blockId = dBlockId.toString()
|
|
|
- connectedBlock.typeCode1 = e1?.classCode
|
|
|
- connectedBlock.typeCode2 = e2?.classCode
|
|
|
- if (!connectedBlocks.contains(connectedBlock)) {
|
|
|
- connectedBlocks.add(connectedBlock)
|
|
|
- }
|
|
|
+ connectedBlock.projectId = projectId
|
|
|
+ connectedBlock.buildingId = buildingId
|
|
|
+ connectedBlock.depth = 0
|
|
|
+ connectedBlock.blockId = dBlockId.toString()
|
|
|
+ connectedBlock.typeCode1 = e1?.classCode
|
|
|
+ connectedBlock.typeCode2 = e2?.classCode
|
|
|
+ if (!connectedBlocks.contains(connectedBlock)) {
|
|
|
+ connectedBlocks.add(connectedBlock)
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
// if(listOf("Eq4403070003129ce8d657c94c648d2d164ccfc6802c",
|
|
|
// "Eq4403070003db010203b5e54a0e8e4de56234cb6ac9",
|
|
|
// "Eq4403070003666459bd6a7e434f8c091392bada823a",
|
|
@@ -375,58 +379,58 @@ open class CalcSpecialService {
|
|
|
// fSet = fullDist(HashSet(belongSet),belongMap)
|
|
|
// }
|
|
|
|
|
|
- for (block in fBlockMap.keys) {
|
|
|
- val set = fBlockMap[block]!!
|
|
|
- if(set.contains(key)){
|
|
|
- fSet = set
|
|
|
- cBlockId = block
|
|
|
- break
|
|
|
+ for (block in fBlockMap.keys) {
|
|
|
+ val set = fBlockMap[block]!!
|
|
|
+ if(set.contains(key)){
|
|
|
+ fSet = set
|
|
|
+ cBlockId = block
|
|
|
+ break
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if(fSet == null){
|
|
|
- fSet = fullDist(HashSet(belongSet),belongMap)
|
|
|
- fBlockId ++
|
|
|
- cBlockId = fBlockId
|
|
|
- fBlockMap[cBlockId] = HashSet(fSet)
|
|
|
- if(cBlockId == 1){
|
|
|
- println(fBlockMap[cBlockId]!!.toJson())
|
|
|
+ if(fSet == null){
|
|
|
+ fSet = fullDist(HashSet(belongSet),belongMap)
|
|
|
+ fBlockId ++
|
|
|
+ cBlockId = fBlockId
|
|
|
+ fBlockMap[cBlockId] = HashSet(fSet)
|
|
|
+ if(cBlockId == 1){
|
|
|
+ println(fBlockMap[cBlockId]!!.toJson())
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
// fSet = fullDist(HashSet(belongSet),belongMap)
|
|
|
// println(fSet.contains(key))
|
|
|
// println(fSet.size)
|
|
|
- for (s in fSet!!) {
|
|
|
- if(typeMap[s] == "Equipment" && key != s){
|
|
|
- val e2 = dcEquipMap[s]
|
|
|
- if(e2 == null || !enumList.contains(e2.classCode)){
|
|
|
- continue
|
|
|
- }
|
|
|
- if(e1.classCode == e2.classCode){
|
|
|
- continue
|
|
|
- }
|
|
|
+ for (s in fSet!!) {
|
|
|
+ if(typeMap[s] == "Equipment" && key != s){
|
|
|
+ val e2 = dcEquipMap[s]
|
|
|
+ if(e2 == null || !enumList.contains(e2.classCode)){
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if(e1.classCode == e2.classCode){
|
|
|
+ continue
|
|
|
+ }
|
|
|
|
|
|
- val connectedBlock = ConnectedBlock()
|
|
|
+ val connectedBlock = ConnectedBlock()
|
|
|
|
|
|
- connectedBlock.id1 = e1.id!!
|
|
|
- connectedBlock.id2 = e2.id!!
|
|
|
- connectedBlock.type1 = "Equipment"
|
|
|
- connectedBlock.type2 = "Equipment"
|
|
|
- connectedBlock.modelId1 = floor.modelId
|
|
|
- connectedBlock.modelId2 = floor.modelId
|
|
|
+ connectedBlock.id1 = e1.id!!
|
|
|
+ connectedBlock.id2 = e2.id!!
|
|
|
+ connectedBlock.type1 = "Equipment"
|
|
|
+ connectedBlock.type2 = "Equipment"
|
|
|
+ connectedBlock.modelId1 = floor.modelId
|
|
|
+ connectedBlock.modelId2 = floor.modelId
|
|
|
// connectedBlock.domain = connector.domain
|
|
|
// connectedBlock.mepSystemType = connector.mepSystemType
|
|
|
- connectedBlock.projectId = projectId
|
|
|
- connectedBlock.buildingId = buildingId
|
|
|
- connectedBlock.depth = 1
|
|
|
- connectedBlock.blockId = cBlockId.toString()
|
|
|
- connectedBlock.typeCode1 = e1?.classCode
|
|
|
- connectedBlock.typeCode2 = e2?.classCode
|
|
|
- if (!connectedBlocks.contains(connectedBlock)) {
|
|
|
- connectedBlocks.add(connectedBlock)
|
|
|
- }
|
|
|
+ connectedBlock.projectId = projectId
|
|
|
+ connectedBlock.buildingId = buildingId
|
|
|
+ connectedBlock.depth = 1
|
|
|
+ connectedBlock.blockId = cBlockId.toString()
|
|
|
+ connectedBlock.typeCode1 = e1?.classCode
|
|
|
+ connectedBlock.typeCode2 = e2?.classCode
|
|
|
+ if (!connectedBlocks.contains(connectedBlock)) {
|
|
|
+ connectedBlocks.add(connectedBlock)
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
// for (block in dBlockMap.keys) {
|
|
|
// val set = dBlockMap[block]!!
|
|
|
// if(set.contains(key)){
|
|
@@ -453,15 +457,18 @@ open class CalcSpecialService {
|
|
|
//
|
|
|
// }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
|
|
+ }
|
|
|
+ connectedBlockService.delete(SFilter.eq("projectId",projectId), SFilter.eq("buildingId",buildingId))
|
|
|
+ val request = SCreateRequest<ConnectedBlock>()
|
|
|
+ request.content = connectedBlocks
|
|
|
+ connectedBlockService.createList(request)
|
|
|
}
|
|
|
- connectedBlockService.delete(SFilter.eq("projectId",projectId), SFilter.eq("buildingId",buildingId))
|
|
|
- val request = SCreateRequest<ConnectedBlock>()
|
|
|
- request.content = connectedBlocks
|
|
|
- connectedBlockService.createList(request)
|
|
|
+
|
|
|
+
|
|
|
return SBaseResponse(SResponseType.success, "")
|
|
|
|
|
|
}
|