|
@@ -10,14 +10,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
-import com.persagy.dmp.common.helper.SpringHelper;
|
|
|
import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
import com.persagy.dmp.digital.client.DigitalRelationFacade;
|
|
|
import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
|
|
|
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
|
|
|
-import com.persagy.proxy.adm.constant.RelCodeEnum;
|
|
|
import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
@@ -222,7 +219,7 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
|
|
|
@Override
|
|
|
protected void processDmpCriteria(QueryCriteria dmpRequest) {
|
|
|
- ObjectNode criteria = dmpRequest.getCriteria();
|
|
|
+ /*ObjectNode criteria = dmpRequest.getCriteria();
|
|
|
if (null==criteria){
|
|
|
return;
|
|
|
}
|
|
@@ -254,7 +251,7 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
}
|
|
|
criteria.set("relationFrom",relationFrom);
|
|
|
criteria.remove("buildingId");
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
|
|
|
private DmpResult<List<ObjRelationDTO>> queryRelation(InstanceUrlParam context, Map<String, AdmEquipment> voMap){
|