caiaf 4 سال پیش
والد
کامیت
15d5867ad6

+ 1 - 1
revit-algorithm/build.gradle

@@ -197,7 +197,7 @@ task buildProdWar {
 // 打测试环境包
 task buildTestWar {
     doFirst {
-        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-test']
+        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-prod']
         test.onlyIf {
             project.hasProperty("needTest")
         }

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

@@ -153,7 +153,8 @@ object EquipmentAnalyzer {
                             obj.family = "OTXXXX"
                         }
                     }
-                    if(!obj.family.isNullOrEmpty()){
+                    family = obj.family
+                    if(!family.isNullOrEmpty()){
 
                         //信息点编码转换
                         for (param in obj.parameters!!) {
@@ -165,7 +166,7 @@ object EquipmentAnalyzer {
 
                             } else if (param.name.equals("构件分类编码")) {
 
-                            } else if (param.name.equals("系统类")) {
+                            } else if (param.name.equals("系统类")) {
 
                             }else{
                                 //信息点编码转换
@@ -183,7 +184,7 @@ object EquipmentAnalyzer {
                         continue
                     }
                     obj.infos = infos
-                    if(obj.family != null && obj.family.equals("OTXXXX")){
+                    if(("OTXXXX").equals(family)){
                         val unrecognizedEquip =  UnrecognizedEquip()
                         unrecognizedEquip.id = UUID.randomUUID().toString()
                         unrecognizedEquip.bimTypeId = obj.bimTypeID