caiaf 4 gadi atpakaļ
vecāks
revīzija
c79b99237d

+ 12 - 7
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/json/EquipmentAnalyzer.kt

@@ -99,6 +99,7 @@ object EquipmentAnalyzer {
         for (obj in equipments) {
             obj.id = CommonService.generateUUID(null, true)
             obj.modelId = baseObj.modelId
+            var family: String? = null
             obj.bimId = "${bimIdPrefix}${obj.sourceId}"
             if (obj.revitId != null && obj.revitId!!.isNotEmpty())
                 equipMap[obj.revitId!!] = obj
@@ -114,7 +115,7 @@ object EquipmentAnalyzer {
                         obj.propertyId = param.value
                     } else if (param.name.equals("构件分类编码")) {
                         obj.bimTypeID = param.value
-                    } else if (param.name.equals("系统类")) {
+                    } else if (param.name.equals("系统类")) {
                         obj.sysName = param.value
                     }
 
@@ -136,11 +137,11 @@ object EquipmentAnalyzer {
                     if(! obj.sysName.isNullOrEmpty()){
                         equipComp = equipCompService.select(SFilter.eq("bimTypeID",obj.bimTypeID!!), SFilter.eq("sysName",obj.sysName!!)).entity()
                         if(equipComp != null){
-                            obj.family = equipComp.classCode?:"OTXXXX"
+                            obj.family = equipComp.classCode?:"XXXXXX"
                         }else{
                             equipComp = equipCompService.select(SFilter.eq("bimTypeID",obj.bimTypeID!!)).entity()
                             if(equipComp != null){
-                                obj.family = equipComp.classCode?:"OTXXXX"
+                                obj.family = equipComp.classCode?:"XXXXXX"
                             }else{
                                 obj.family = "OTXXXX"
                             }
@@ -149,12 +150,13 @@ object EquipmentAnalyzer {
                     }else{
                         equipComp = equipCompService.select(SFilter.eq("bimTypeID",obj.bimTypeID!!)).entity()
                         if(equipComp != null){
-                            obj.family = equipComp.classCode?:"OTXXXX"
+                            obj.family = equipComp.classCode?:"XXXXXX"
                         }else{
                             obj.family = "OTXXXX"
                         }
                     }
-                    if(!obj.family.isNullOrEmpty()){
+                    family = obj.family
+                    if(!family.isNullOrEmpty()){
 
                         //信息点编码转换
                         for (param in obj.parameters!!) {
@@ -170,7 +172,7 @@ object EquipmentAnalyzer {
 
                             }else{
                                 //信息点编码转换
-                                val infoPointComp = infoPointCompService.select(SFilter.eq("family", obj.family!!), SFilter.eq("infoPointCode", param.name!!)).entity()
+                                val infoPointComp = infoPointCompService.select(SFilter.eq("family", family!!), SFilter.eq("infoPointCode", param.name!!)).entity()
                                 if (infoPointComp != null) {
                                     infos[infoPointComp.sInfoPointCode!!] = param.value ?: ""
                                 } else {
@@ -184,9 +186,12 @@ object EquipmentAnalyzer {
                         continue
                     }
                     obj.infos = infos
-                    if(("OTXXXX") != obj.family){
+                    if(("OTXXXX") == family || ("XXXXXX") == family){
+
+                    }else{
                         newEquipmnets.add(obj)
                     }
+
                 }
             }
         }