|
@@ -127,17 +127,16 @@ public class WDRwdObjectTransferHandler {
|
|
|
log.warn("设备信息编码为空,不进行同步");
|
|
|
continue;
|
|
|
}
|
|
|
- String classstructureid = StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT));
|
|
|
+
|
|
|
+ String classstructureid = calassPersagy.getClassstructureid();
|
|
|
+ /*String classstructureid = StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT));
|
|
|
if (StringUtil.isBlank(classstructureid)) {
|
|
|
log.warn("万达设备分类ID不存在,不进行同步,本方对象ID:{}, 项目ID:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId());
|
|
|
return;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
// 查询出18类设备单独的信息点
|
|
|
- //if (CollectionUtil.isEmpty(wdfacilityRelList)) {
|
|
|
- // 循环万达项目ID与博锐尚格项目ID映射表数据时,wdfacility_rel_persagy只查询一次
|
|
|
- List<WdfacilityRelPersagy> wdfacilityRelList = this.listWdfacilityRelPersagy(calassPersagy.getWdClassCode(), calassPersagy.getClassstructureid());
|
|
|
- //}
|
|
|
+ List<WdfacilityRelPersagy> wdfacilityRelList = this.listWdfacilityRelPersagy(calassPersagy.getWdClassCode(), classstructureid);
|
|
|
|
|
|
// 正常数据开始同步
|
|
|
this.saveHydomcAssetAndAssetspec(wdfacilityRelList, rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
|