From f1daca3198ace4a8832c35c5c212f8e488f92793 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 19 Mar 2025 10:48:44 +0800
Subject: [PATCH] =?UTF-8?q?3/19=20=E8=8E=B7=E5=8F=96=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E5=AE=8C=E6=88=901.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 18 +++++++
 .../glxp/mipsdl/client/axxyy/AxxyyClient.java | 50 +++++++++++++++----
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3365f5..b46001d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,24 @@
             <version>3.5.2</version>
         </dependency>
 
+        <!-- Jackson 核心库 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+        <!-- Jackson XML 数据格式处理库 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
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<ProductEntity> page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
-        IPage<ProductEntity> productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper<ProductEntity>()
-                .lambda()
-                .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
-                .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
-        PageSimpleResponse<ProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(productEntityIPage.getTotal());
-        pageSimpleResponse.setList(productEntityIPage.getRecords());
-        return ResultVOUtils.success(pageSimpleResponse);
+//        IPage<ProductEntity> page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
+//        IPage<ProductEntity> productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper<ProductEntity>()
+//                .lambda()
+//                .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
+//                .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
+//        PageSimpleResponse<ProductEntity> 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<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, "网络错误，或远程服务器异常无法返回正确结果");
+        }
     }
 
     /**