|
@@ -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
|