caiaf пре 4 година
родитељ
комит
92660b5fcc

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

@@ -139,16 +139,20 @@ 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?:"XXXXXX"
+                            }else{
+                                obj.family = "OTXXXX"
+                            }
                             //未识别的设备类型,类型码转换为"OTXXXX",OT表示“其他系统”,“XXXX”表示未识别的设备
-                            obj.family = "OTXXXX"
-
                         }
                     }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"
                         }
@@ -184,7 +188,7 @@ object EquipmentAnalyzer {
                         continue
                     }
                     obj.infos = infos
-                    if(("OTXXXX").equals(family)){
+                    if(("OTXXXX") == family || ("XXXXXX") == family){
                         val unrecognizedEquip =  UnrecognizedEquip()
                         unrecognizedEquip.id = UUID.randomUUID().toString()
                         unrecognizedEquip.bimTypeId = obj.bimTypeID