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