zhangqiankun 3 anni fa
parent
commit
771559a211

+ 2 - 2
src/main/java/com/persagy/transfer/constant/InfosKeyConstant.java

@@ -8,9 +8,9 @@ package com.persagy.transfer.constant;
 public class InfosKeyConstant {
 
     /**
-     * 设计图纸编码
+     * BIM 类型ID
      */
-    public static final String CADID = "cADID";
+    public static final String BIM_TYPE_ID = "bimTypeId";
     
     /**
      * 设备编码(工程信息化编码)

+ 5 - 12
src/main/java/com/persagy/transfer/handle/WDRwdObjectTransferHandler.java

@@ -15,7 +15,6 @@ import com.persagy.common.utils.StringUtil;
 import com.persagy.transfer.cache.LocalCache;
 import com.persagy.transfer.constant.InfosKeyConstant;
 import com.persagy.transfer.constant.ObjectTypeMapping;
-import com.persagy.transfer.constant.SwitchConstant;
 import com.persagy.transfer.pojo.dto.RwdObjectWd;
 import com.persagy.transfer.pojo.dto.WdclassRelPersagy;
 import com.persagy.transfer.pojo.dto.WdfacilityRelPersagy;
@@ -112,20 +111,14 @@ public class WDRwdObjectTransferHandler {
         		}
             	
             	// 获取此设备的构建本地编码
-            	String localId = StringTool.object2String(infos.get(InfosKeyConstant.CADID));
-            	if (StringUtil.isBlank(localId)) {
-    				log.warn("项目ID为:{} 的对象本地编码为空,对象ID:{}", projectId, rwdObjectWd.getId());
+            	String bimTypeId = StringTool.object2String(infos.get(InfosKeyConstant.BIM_TYPE_ID));
+            	if (StringUtil.isBlank(bimTypeId)) {
+    				log.warn("项目ID为:{} 的对象构建本地编码为空,对象ID:{}", projectId, rwdObjectWd.getId());
     				continue;
     			}
-            	int lastIndexOf = localId.lastIndexOf(SwitchConstant.POINT);
-            	if (lastIndexOf <= 0) {
-            		log.warn("项目ID为:{} 的对象本地编码不规范,本地编码:{}", projectId, localId);
-    				continue;
-    			}
-            	localId = localId.substring(0, lastIndexOf);
-            	WdclassRelPersagy calassPersagy = LocalCache.CLASS_CODE_MAPPING_BY_WD.get(LocalCache.getWDCacheKey(classCode, localId));
+            	WdclassRelPersagy calassPersagy = LocalCache.CLASS_CODE_MAPPING_BY_WD.get(LocalCache.getWDCacheKey(classCode, bimTypeId));
             	if (calassPersagy == null) {
-            		log.warn("项目ID为:{} 的对象本地编码不匹配,对象ID:{},本地编码:{}", projectId, rwdObjectWd.getId(), localId);
+            		log.warn("项目ID为:{} 的对象构建本地编码不匹配,对象ID:{},构建本地编码:{}", projectId, rwdObjectWd.getId(), bimTypeId);
             		continue;
     			}