Quellcode durchsuchen

fix bug:adm根据建筑id和楼层id查询系统列表无法查询到数据

lijie vor 3 Jahren
Ursprung
Commit
9bcad4f72b

+ 7 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java

@@ -4,11 +4,15 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
+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.impl.AbstractAdmBaseServiceImpl;
@@ -102,7 +106,7 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
 
     @Override
     public void processDmpCriteria(QueryCriteria dmpRequest) {
-        /*ObjectNode criteria = dmpRequest.getCriteria();
+        ObjectNode criteria = dmpRequest.getCriteria();
         if (null==criteria){
             return;
         }
@@ -134,13 +138,14 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
             }
             criteria.set("relationFrom",relationFrom);
             criteria.remove("buildingId");
-        }*/
+        }
     }
 
     @Override
     public AdmResponse queryNewInternal(String buildingId, String floorId, AdmQueryCriteria request) {
         constructQueryNewParam(buildingId,floorId,request);
         QueryCriteria rwdQueryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
+        processDmpCriteria(rwdQueryCriteria);
         if(JSONUtil.isNull(rwdQueryCriteria.getCriteria())){
             return AdmResponse.failure("请求参数错误");
         }