|
@@ -140,6 +140,12 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
|
|
|
//数据合并
|
|
|
ObjectDigital newDbVO = dbVO;
|
|
|
+ // 合并通用信息点数据
|
|
|
+ if (!vo.getObjType().equals(vo.getClassCode())){
|
|
|
+ Map<String, ObjectInfoDefine> commonInfoMap = allInfoMap.getOrDefault(vo.getObjType(), new HashMap<>());
|
|
|
+ dataMerge(newDbVO,vo,commonInfoMap,fieldSet);
|
|
|
+ }
|
|
|
+ // 合并对象分类信息点数据
|
|
|
Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.get(vo.getClassCode());
|
|
|
dataMerge(newDbVO,vo,infoDefineMap,fieldSet);
|
|
|
|
|
@@ -595,9 +601,9 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
infoMap.putAll(infoDefineMap);
|
|
|
}
|
|
|
}
|
|
|
- String objType = objTypeMap.get(vo.getClassCode());
|
|
|
+ String objType = objTypeMap.getOrDefault(vo.getClassCode(),"");
|
|
|
//设置通用信息点
|
|
|
- if(!objType.equals(vo.getClassCode())){
|
|
|
+ if(!objType.equals(vo.getClassCode()) && MapUtil.isNotEmpty(allInfoMap)){
|
|
|
Map<String, ObjectInfoDefine> commonInfoDefineMap = allInfoMap.getOrDefault(objType,new HashMap<>());
|
|
|
if(null!=commonInfoDefineMap && commonInfoDefineMap.size()>0){
|
|
|
infoMap.putAll(commonInfoDefineMap);
|
|
@@ -760,9 +766,12 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
}
|
|
|
for (ObjectDigital digital : voList) {
|
|
|
ObjectDigital dbDigital = dbMap.get(digital.getId());
|
|
|
- if(dbDigital!=null){
|
|
|
+ if(dbDigital!=null && StrUtil.isBlank(digital.getClassCode())){
|
|
|
digital.setClassCode(dbDigital.getClassCode());
|
|
|
}
|
|
|
+ if(dbDigital!=null && StrUtil.isBlank(digital.getObjType())){
|
|
|
+ digital.setObjType(dbDigital.getObjType());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|