|
@@ -99,7 +99,6 @@ 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
|
|
@@ -162,11 +161,11 @@ object EquipmentAnalyzer {
|
|
|
|
|
|
} else if (param.name.equals("构件分类编码")) {
|
|
|
|
|
|
- } else if (param.name.equals("系统分类")) {
|
|
|
+ } else if (param.name.equals("系统类型")) {
|
|
|
|
|
|
}else{
|
|
|
//信息点编码转换
|
|
|
- val infoPointComp = infoPointCompService.select(SFilter.eq("family", family!!), SFilter.eq("infoPointCode", param.name!!)).entity()
|
|
|
+ val infoPointComp = infoPointCompService.select(SFilter.eq("family", obj.family!!), SFilter.eq("infoPointCode", param.name!!)).entity()
|
|
|
if (infoPointComp != null) {
|
|
|
infos[infoPointComp.sInfoPointCode!!] = param.value ?: ""
|
|
|
} else {
|
|
@@ -180,7 +179,7 @@ object EquipmentAnalyzer {
|
|
|
continue
|
|
|
}
|
|
|
obj.infos = infos
|
|
|
- if(("OTXXXX").equals(obj.family)){
|
|
|
+ if(("OTXXXX") != obj.family){
|
|
|
newEquipmnets.add(obj)
|
|
|
}
|
|
|
}
|