|
@@ -10,8 +10,9 @@ import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
import com.persagy.dmp.common.constant.ValidEnum;
|
|
import com.persagy.dmp.common.constant.ValidEnum;
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
|
+import com.persagy.dmp.common.model.response.CommonResult;
|
|
import com.persagy.dmp.common.utils.JsonHelper;
|
|
import com.persagy.dmp.common.utils.JsonHelper;
|
|
-import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
|
|
|
|
|
|
+import com.persagy.dmp.delivery.dto.ObjectInfoCollectDTO;
|
|
import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
|
|
import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
@@ -31,7 +32,10 @@ import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Collections;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @ClassName AbstractAdmDictBaseServiceImpl
|
|
* @ClassName AbstractAdmDictBaseServiceImpl
|
|
@@ -341,8 +345,8 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
}
|
|
}
|
|
// 调用中台查询
|
|
// 调用中台查询
|
|
log.info(para.toString());
|
|
log.info(para.toString());
|
|
- DmpResult<JSONArray> dmpResult = rwdClient.queryObjectInfoCollect(context, para);
|
|
|
|
- List<ObjectInfoCollect> admVOs = AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.getData(), request.getProjection(), ObjectInfoCollect.class);
|
|
|
|
|
|
+ CommonResult<List<ObjectInfoCollectDTO>> dmpResult = rwdClient.queryObjectInfoCollect(context, para);
|
|
|
|
+ List<ObjectInfoCollectDTO> admVOs = dmpResult.getData();
|
|
// 设置返回值
|
|
// 设置返回值
|
|
AdmResponse response = AdmResponse.success(admVOs);
|
|
AdmResponse response = AdmResponse.success(admVOs);
|
|
Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
|
|
Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
|