From 04534e3f4333b7b30368c2018488c79fa67e02d1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 4 Feb 2024 14:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=87=E6=BB=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/thrsys/impl/ThrProductsServiceImpl.java    | 7 ++++---
 src/main/resources/application-dev.yml                     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 9479ac69f..ba86848d7 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -192,7 +192,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
     @Override
     public BaseResponse downloadThrPi(ThrSystemDetailEntity thrSystemDetailEntity) {
         int page = 1;
-        int limit = 200;
+        int limit = 100;
         FilterThrProductsRequest request = new FilterThrProductsRequest();
         request.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
         request.setLimit(limit);
@@ -238,7 +238,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         }
                     }
                 });
-                if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
+                if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {
                     page++;
                 } else {
                     break;
@@ -289,7 +289,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         }
                     }
                 });
-                if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
+                //total = -666 表示出错，-555表示数据已经被过滤，可以进行下一页下载
+                if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {
                     page++;
                 } else {
                     if (count == 0) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b2df4abe2..eff144325 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari: