|
@@ -22,8 +22,10 @@ import com.persagy.dmp.common.helper.SpringHelper;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
import com.persagy.dmp.define.entity.ObjectTypeDefine;
|
|
|
import com.persagy.dmp.digital.client.DigitalObjectFacade;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
|
|
|
+import com.persagy.proxy.adm.annotations.CascadeColumn;
|
|
|
import com.persagy.proxy.adm.constant.*;
|
|
|
import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
|
|
|
import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
@@ -215,13 +217,22 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
admSystemList.addAll(vo.getGeneralSystem());
|
|
|
}
|
|
|
// 3.对部分infos值在infos中也放置一份
|
|
|
+ Map<String, Field> objFieldMap = JsonNodeUtils.getFieldMap(ObjectDigital.class);
|
|
|
+ Map<String, Field> fieldMap = JsonNodeUtils.getFieldMap(AdmSpace.class);
|
|
|
+ Set<String> fields = fieldMap.keySet();
|
|
|
for (AdmSpace space : vos) {
|
|
|
Map<String, Object> infos = space.getInfos();
|
|
|
if (MapUtil.isEmpty(infos)){
|
|
|
infos = new HashMap<>();
|
|
|
}
|
|
|
- // 重新放置一下height的值
|
|
|
- infos.put(AdmDictConstant.HEIGHT,ReflectUtil.getFieldValue(space,AdmDictConstant.HEIGHT));
|
|
|
+ for (String fieldKey : fields) {
|
|
|
+ if (fieldMap.get(fieldKey).isAnnotationPresent(CascadeColumn.class)
|
|
|
+ || objFieldMap.containsKey(fieldKey)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ // 重新放置一下height的值
|
|
|
+ infos.put(fieldKey,ReflectUtil.getFieldValue(space,fieldKey));
|
|
|
+ }
|
|
|
space.setInfos(infos);
|
|
|
}
|
|
|
// 对象扩展属性赋值
|