Explorar el Código

设备分类ID为空的,不进行同步

zhangqiankun hace 3 años
padre
commit
9fb7e97748

+ 6 - 1
src/main/java/com/persagy/transfer/handle/WDRwdObjectTransferHandler.java

@@ -127,6 +127,11 @@ public class WDRwdObjectTransferHandler {
         			log.warn("设备信息编码为空,不进行同步");
         			continue;
         		}
+            	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)) {
@@ -135,7 +140,7 @@ public class WDRwdObjectTransferHandler {
             	//}
                 
                 // 正常数据开始同步
-                this.saveHydomcAssetAndAssetspec(wdfacilityRelList, rwdObjectWd, infos, wdProjectId, calassPersagy.getClassstructureid(), sbybm);
+                this.saveHydomcAssetAndAssetspec(wdfacilityRelList, rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
 			} catch (Exception e) {
 				log.error("对象数据同步失败,失败对象ID:" + rwdObjectWd.getId(), e);
 			}

+ 1 - 1
src/main/java/com/persagy/transfer/service/impl/HydomcAssetServiceImpl.java

@@ -94,7 +94,7 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
     	 		// 厂商设备型号
     			.sbxh(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_MODEL)))
     			// 设备分类ID
-    			.classstructureid(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT)))
+    			.classstructureid(classstructureid)
     			// 设备状态 运行中/报废    默认都为运行中
     			.status(valid == 0 ? SwitchConstant.SCRAP : SwitchConstant.RUNNING)
     			// 设备序号 同类设备的序号,即第几台设备:第几台电梯

+ 1 - 1
src/main/java/com/persagy/transfer/service/impl/HydomcAssetspecServiceImpl.java

@@ -95,7 +95,7 @@ public class HydomcAssetspecServiceImpl extends SuperServiceImpl<HydomcAssetspec
 				// 设备编码 关联设备信息 wD_gongchengxinxihua
 				.sbybm(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_CODE)))
 				// 设备分类id 1507
-				.classstructureid(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT)))
+				.classstructureid(classstructureid)
 				// 设备分类名称 电梯系统/扶梯/人行步道 (取自中间表wdfacility_rel_persagy)
 				.classqc(wdfacilityRelPersagy.getClassqc())
 				// 设备参数id 1106 (取自中间表wdfacility_rel_persagy)