查询三方主数据接口修复1
This commit is contained in:
-27
@@ -8,7 +8,6 @@ import com.linke.thirdParty.domain.departInterfaceInfo.repository.mapper.SysDepa
|
|||||||
import com.mhd.common.core.domain.thirdparty.MdmMerchantQueryDTO;
|
import com.mhd.common.core.domain.thirdparty.MdmMerchantQueryDTO;
|
||||||
import com.mhd.common.core.domain.thirdparty.MdmMerchantQueryResultDTO;
|
import com.mhd.common.core.domain.thirdparty.MdmMerchantQueryResultDTO;
|
||||||
import com.mhd.common.core.domain.thirdparty.MdmMerchantRecordDTO;
|
import com.mhd.common.core.domain.thirdparty.MdmMerchantRecordDTO;
|
||||||
import com.mhd.common.core.domain.thirdparty.MdmMerchantSyncFilter;
|
|
||||||
import com.mhd.common.core.exception.ServiceException;
|
import com.mhd.common.core.exception.ServiceException;
|
||||||
import com.mhd.common.core.utils.StringUtils;
|
import com.mhd.common.core.utils.StringUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -24,7 +23,6 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 北京三维天地 MDM 客商主数据查询
|
* 北京三维天地 MDM 客商主数据查询
|
||||||
@@ -46,31 +44,6 @@ public class MdmMasterDataApplicationService {
|
|||||||
queryDTO.getOrgNcCode(), queryDTO.getCurrentPage(), queryDTO.getLastModifyRecordTime());
|
queryDTO.getOrgNcCode(), queryDTO.getCurrentPage(), queryDTO.getLastModifyRecordTime());
|
||||||
String responseBody = doPost(config.url, config.usercode, config.password, requestBody);
|
String responseBody = doPost(config.url, config.usercode, config.password, requestBody);
|
||||||
MdmMerchantQueryResultDTO result = parseResponse(responseBody);
|
MdmMerchantQueryResultDTO result = parseResponse(responseBody);
|
||||||
return applyOrgFilter(queryDTO, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 按组织NC编码匹配客商CODE,过滤无关数据并修正分页描述。
|
|
||||||
*/
|
|
||||||
private MdmMerchantQueryResultDTO applyOrgFilter(MdmMerchantQueryDTO queryDTO, MdmMerchantQueryResultDTO result) {
|
|
||||||
if (result == null || StringUtils.isEmpty(queryDTO.getOrgNcCode())
|
|
||||||
|| result.getDataInfo() == null || result.getDataInfo().isEmpty()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
String orgNcCode = queryDTO.getOrgNcCode().trim();
|
|
||||||
int rawCount = result.getDataInfo().size();
|
|
||||||
List<MdmMerchantRecordDTO> filtered = result.getDataInfo().stream()
|
|
||||||
.filter(record -> orgNcCode.equals(record.getDesc24()))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
result.setDataInfo(filtered);
|
|
||||||
if (rawCount != filtered.size()) {
|
|
||||||
String note = String.format(
|
|
||||||
"(MDM原始%d条,按CODE=%s过滤后%d条;MDM总条数totalNumber为未过滤全库统计)",
|
|
||||||
rawCount, orgNcCode, filtered.size());
|
|
||||||
result.setDesc(StringUtils.isEmpty(result.getDesc()) ? note : result.getDesc() + note);
|
|
||||||
log.info("MDM客商查询应用侧过滤 orgNcCode={}, rawPageSize={}, filteredPageSize={}, mdmTotalNumber={}",
|
|
||||||
orgNcCode, rawCount, filtered.size(), result.getTotalNumber());
|
|
||||||
}
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user