|
|
@ -206,15 +206,47 @@ public class AxxyyClient extends CommonHttpClient {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
|
|
|
|
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
|
|
|
|
IPage<ProductEntity> page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
|
|
|
|
// IPage<ProductEntity> page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
|
|
|
|
IPage<ProductEntity> productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper<ProductEntity>()
|
|
|
|
// IPage<ProductEntity> productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper<ProductEntity>()
|
|
|
|
.lambda()
|
|
|
|
// .lambda()
|
|
|
|
.like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
|
|
|
|
// .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
|
|
|
|
.like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
|
|
|
|
// .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
|
|
|
|
PageSimpleResponse<ProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
// PageSimpleResponse<ProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
pageSimpleResponse.setTotal(productEntityIPage.getTotal());
|
|
|
|
// pageSimpleResponse.setTotal(productEntityIPage.getTotal());
|
|
|
|
pageSimpleResponse.setList(productEntityIPage.getRecords());
|
|
|
|
// pageSimpleResponse.setList(productEntityIPage.getRecords());
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
// return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 发送请求
|
|
|
|
|
|
|
|
String response = callInterface(getMsgHeader("getPriceDict"), setFilter());
|
|
|
|
|
|
|
|
String xml = getXml(response);
|
|
|
|
|
|
|
|
if (xml == null){
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500,"获取项目字典错误");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
DataVo dataVo = getDataVo(xml);
|
|
|
|
|
|
|
|
if (dataVo.getCode() != 0){
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500,"获取项目字典错误");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<PriceDict> list = dataVo.getList(PriceDict.class);
|
|
|
|
|
|
|
|
List<ThrProductsResponse> thrProductsResponses = new ArrayList<>();
|
|
|
|
|
|
|
|
log.info("总数:" + list.size());
|
|
|
|
|
|
|
|
for (PriceDict priceDict : list) {
|
|
|
|
|
|
|
|
ThrProductsResponse thrProductsResponse = new ThrProductsResponse();
|
|
|
|
|
|
|
|
thrProductsResponse.setCode(priceDict.getCode());
|
|
|
|
|
|
|
|
thrProductsResponse.setName(priceDict.getName());
|
|
|
|
|
|
|
|
thrProductsResponse.setPrice(priceDict.getPrice());
|
|
|
|
|
|
|
|
thrProductsResponse.setSpec(priceDict.getSpell());
|
|
|
|
|
|
|
|
thrProductsResponses.add(thrProductsResponse);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
PageSimpleResponse<ThrProductsResponse> thrProductsResponsePageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
|
|
|
thrProductsResponsePageSimpleResponse.setTotal((long) thrProductsResponses.size()); // 设置总数
|
|
|
|
|
|
|
|
thrProductsResponsePageSimpleResponse.setList(thrProductsResponses); // 设置列表
|
|
|
|
|
|
|
|
return ResultVOUtils.success(thrProductsResponsePageSimpleResponse);
|
|
|
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
|
|
|
log.error("异常信息:{}", e);
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果");
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|