|
@@ -2,12 +2,10 @@ package com.persagy.proxy.adm.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
-
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
|
import com.persagy.dmp.common.utils.JsonHelper;
|
|
@@ -32,8 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @ClassName AbstractAdmDictBaseServiceImpl
|
|
@@ -126,9 +122,9 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
|
}
|
|
|
// 调用中台查询
|
|
|
DmpResult<JSONArray> dmpResult = rwdClient.queryObjectInfo(context, para);
|
|
|
- List<T> admVOs = AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.getData(), request.getProjection(), clazz);
|
|
|
+ List<AdmObjectInfo> admVOs = AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.getData(), request.getProjection(), AdmObjectInfo.class);
|
|
|
// BDTP信息点格式与ADM兼容处理
|
|
|
- handleObjectInfoResult((List<AdmObjectInfo>) admVOs);
|
|
|
+ handleObjectInfoResult(admVOs);
|
|
|
// 设置返回值
|
|
|
AdmResponse response = AdmResponse.success(admVOs);
|
|
|
Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
|