diff --git a/pom.xml b/pom.xml
index e3365f5..b46001d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,24 @@
3.5.2
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.13.0
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+ 2.13.0
+
+
+ com.google.code.gson
+ gson
+ 2.8.8
+
+
org.dom4j
dom4j
diff --git a/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java b/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java
index 3464289..2bcd96c 100644
--- a/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java
@@ -206,15 +206,47 @@ public class AxxyyClient extends CommonHttpClient {
*/
@Override
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
- IPage page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
- IPage productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper()
- .lambda()
- .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
- .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
- PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();
- pageSimpleResponse.setTotal(productEntityIPage.getTotal());
- pageSimpleResponse.setList(productEntityIPage.getRecords());
- return ResultVOUtils.success(pageSimpleResponse);
+// IPage page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
+// IPage productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper()
+// .lambda()
+// .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
+// .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
+// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();
+// pageSimpleResponse.setTotal(productEntityIPage.getTotal());
+// pageSimpleResponse.setList(productEntityIPage.getRecords());
+// 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 list = dataVo.getList(PriceDict.class);
+ List 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 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, "网络错误,或远程服务器异常无法返回正确结果");
+ }
}
/**