From 5d4dc61fa76a536e323f0b48483fac30d6844915 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 17 Mar 2025 16:59:39 +0800
Subject: [PATCH] 3/7 1.0

---
 .../com/glxp/api/http/ErpBasicClient.java     |  1 -
 .../basic/impl/BasicDestinyRelService.java    | 39 +++++++++++++++++++
 .../impl/ThrInvWarehouseServiceImpl.java      |  5 ++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java
index dbb57956e..0594dd692 100644
--- a/src/main/java/com/glxp/api/http/ErpBasicClient.java
+++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java
@@ -309,7 +309,6 @@ public class ErpBasicClient {
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/basic/getProject";
         try {
             String response = httpOkClient.uCloudPost(url, dlThirdDestinyRequest);
-            log.error("获取收费项目：：：：：：" + response);
             BaseResponse<PageSimpleResponse<BasicSkProjectResponse>> listBaseResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<BasicSkProjectResponse>>>() {
                     });
diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java
index b02a1b4dc..806a11db5 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java
@@ -118,16 +118,47 @@ public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, B
         int limit = 1000;
         request.setThirdSys("thirdId");
         request.setLimit(limit);
+//        while (true) {
+//            request.setPage(page);
+//            BaseResponse<PageSimpleResponse<BasicSkProjectResponse>> baseResponse = erpBasicClient.getBasicProject(request);
+//            if (baseResponse.getCode() == 20000) {
+//                List<BasicSkProjectResponse> list = baseResponse.getData().getList();
+//                if (CollUtil.isNotEmpty(list)) {
+//                    list.forEach(item -> {
+//                        BasicSkProjectEntity basicSkProjectEntity = new BasicSkProjectEntity();
+//                        BeanUtil.copyProperties(item, basicSkProjectEntity);
+//                        basicSkProjectEntity.setType(2);
+//                        Boolean b = basicSkProjectMapper.exists(new LambdaQueryWrapper<BasicSkProjectEntity>().eq(BasicSkProjectEntity::getCode, basicSkProjectEntity.getCode()));
+//                        if (b) {
+//                            basicSkProjectMapper.update(basicSkProjectEntity, new LambdaUpdateWrapper<BasicSkProjectEntity>().eq(BasicSkProjectEntity::getCode, basicSkProjectEntity.getCode()));
+//                        } else {
+//                            basicSkProjectEntity.setId(IdUtil.getSnowflakeNextId());
+//                            basicSkProjectMapper.insert(basicSkProjectEntity);
+//                        }
+//                    });
+//                }
+//                if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
+//                    page++;
+//                } else {
+//                    break;
+//                }
+//            } else {
+//                return ResultVOUtils.error(500, "下载异常中断");
+//            }
+//        }
         while (true) {
             request.setPage(page);
             BaseResponse<PageSimpleResponse<BasicSkProjectResponse>> baseResponse = erpBasicClient.getBasicProject(request);
+
             if (baseResponse.getCode() == 20000) {
                 List<BasicSkProjectResponse> list = baseResponse.getData().getList();
+
                 if (CollUtil.isNotEmpty(list)) {
                     list.forEach(item -> {
                         BasicSkProjectEntity basicSkProjectEntity = new BasicSkProjectEntity();
                         BeanUtil.copyProperties(item, basicSkProjectEntity);
                         basicSkProjectEntity.setType(2);
+
                         Boolean b = basicSkProjectMapper.exists(new LambdaQueryWrapper<BasicSkProjectEntity>().eq(BasicSkProjectEntity::getCode, basicSkProjectEntity.getCode()));
                         if (b) {
                             basicSkProjectMapper.update(basicSkProjectEntity, new LambdaUpdateWrapper<BasicSkProjectEntity>().eq(BasicSkProjectEntity::getCode, basicSkProjectEntity.getCode()));
@@ -136,7 +167,15 @@ public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, B
                             basicSkProjectMapper.insert(basicSkProjectEntity);
                         }
                     });
+
+                    // 检查 list.size() 是否大于 1000
+                    if (list.size() > 1000) {
+                        log.error("List size exceeds 1000, stopping the loop." + list.size());
+                        break;
+                    }
                 }
+
+                // 检查是否继续分页
                 if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
                     page++;
                 } else {
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
index eecde8a5d..4de022dab 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
@@ -164,7 +164,10 @@ public class ThrInvWarehouseServiceImpl extends ServiceImpl<ThrInvWarehouseDao,
                         }
                     }
                 });
-
+                if (list.size() > 100) {
+                    log.error("downloadThrInv List size exceeds 1000, stopping the loop." + list.size());
+                    break;
+                }
                 //请求下一页数据
                 if (list.size() >= limit) {
                     page++;