From 7d23738fb7fe1fea0500155b008853c477450ee6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 七月 2025 21:21:55 +0800
Subject: [PATCH] 政务云数据上传bug修改

---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java |   62 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
index 7548617..1f199f6 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
@@ -275,60 +275,94 @@
             if (!appCoupons.isEmpty()) {
                 log.info("用户优惠券"+appCoupons.size());
                 // 将id 设置为null
-                appCouponService.saveOrUpdateBatch(appCoupons);
+                log.info("策略"+appCoupons.size());
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appCoupons.size(); i += 700) {
+                    appCouponService.saveOrUpdateBatch(appCoupons.subList(i, Math.min(i + 700, appCoupons.size())));
+                }
             }
             List<TAppUser> appUsers = data.getAppUsers();
             if (!appUsers.isEmpty()) {
                 log.info("用户"+appUsers.size());
 
-                appUserService.saveOrUpdateBatch(appUsers);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUsers.size(); i += 700) {
+                    appUserService.saveOrUpdateBatch(appUsers.subList(i, Math.min(i + 700, appUsers.size())));
+                }
             }
             List<TAppUserAddress> appUserAddresses = data.getAppUserAddresses();
             if (!appUserAddresses.isEmpty()) {
                 log.info("用户地址"+appUserAddresses.size());
 
-                appUserAddressService.saveOrUpdateBatch(appUserAddresses);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserAddresses.size(); i += 700) {
+                    appUserAddressService.saveOrUpdateBatch(appUserAddresses.subList(i, Math.min(i + 700, appUserAddresses.size())));
+                }
             }
             List<TAppUserCar> appUserCars = data.getAppUserCars();
             if (!appUserCars.isEmpty()) {
                 log.info("用户车辆"+appUserCars.size());
                 appUserCarService.saveOrUpdateBatch(appUserCars);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserCars.size(); i += 700) {
+                    appUserCarService.saveOrUpdateBatch(appUserCars.subList(i, Math.min(i + 700, appUserCars.size())));
+                }
             }
             List<TAppUserIntegralChange> appUserIntegralChanges = data.getAppUserIntegralChanges();
             if (!appUserIntegralChanges.isEmpty()) {
                 log.info("用户积分变动"+appUserIntegralChanges.size());
 
-                appUserIntegralChangeService.saveOrUpdateBatch(appUserIntegralChanges);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserIntegralChanges.size(); i += 700) {
+                    appUserIntegralChangeService.saveOrUpdateBatch(appUserIntegralChanges.subList(i, Math.min(i + 700, appUserIntegralChanges.size())));
+                }
             }
             List<TAppUserSign> appUserSigns = data.getAppUserSigns();
             if (!appUserSigns.isEmpty()) {
                 log.info("用户签到"+appUserSigns.size());
 
-                appUserSignService.saveOrUpdateBatch(appUserSigns);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserSigns.size(); i += 700) {
+                    appUserSignService.saveOrUpdateBatch(appUserSigns.subList(i, Math.min(i + 700, appUserSigns.size())));
+                }
             }
             List<TAppUserTag> appUserTags = data.getAppUserTags();
             if (!appUserTags.isEmpty()) {
                 log.info("用户标签"+appUserTags.size());
 
-                appUserTagService.saveOrUpdateBatch(appUserTags);
+
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserTags.size(); i += 700) {
+                    appUserTagService.saveOrUpdateBatch(appUserTags.subList(i, Math.min(i + 700, appUserTags.size())));
+                }
             }
             List<TAppUserVipDetail> appUserVipDetails = data.getAppUserVipDetails();
             if (!appUserVipDetails.isEmpty()) {
                 log.info("用户会员明细"+appUserVipDetails.size());
 
-                appUserVipDetailService.saveOrUpdateBatch(appUserVipDetails);
+
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < appUserVipDetails.size(); i += 700) {
+                    appUserVipDetailService.saveOrUpdateBatch(appUserVipDetails.subList(i, Math.min(i + 700, appUserVipDetails.size())));
+                }
             }
             List<TInviteUser> inviteUsers = data.getInviteUsers();
             if (!inviteUsers.isEmpty()) {
                 log.info("邀请用户"+inviteUsers.size());
 
-                inviteUserService.saveOrUpdateBatch(inviteUsers);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < inviteUsers.size(); i += 700) {
+                    inviteUserService.saveOrUpdateBatch(inviteUsers.subList(i, Math.min(i + 700, inviteUsers.size())));
+                }
             }
             List<TInvoiceInformation> invoiceInformations = data.getInvoiceInformations();
             if (!invoiceInformations.isEmpty()) {
                 log.info("开票"+invoiceInformations.size());
 
-                tInvoiceInformationService.saveOrUpdateBatch(invoiceInformations);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < invoiceInformations.size(); i += 700) {
+                    tInvoiceInformationService.saveOrUpdateBatch(invoiceInformations.subList(i, Math.min(i + 700, invoiceInformations.size())));
+                }
             }
         }
         // chargingPile服务
@@ -340,13 +374,19 @@
             if (!partners.isEmpty()) {
                 log.info("合作商"+partners.size());
 
-                partnerService.saveOrUpdateBatch(partners);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < partners.size(); i += 700) {
+                    partnerService.saveOrUpdateBatch(partners.subList(i, Math.min(i + 700, partners.size())));
+                }
             }
             List<Site> sites = data1.getSites();
             if (!sites.isEmpty()) {
                 log.info("站点"+sites.size());
 
-                siteService.saveOrUpdateBatch(sites);
+                // 分批插入数据 每次最多700条
+                for (int i = 0; i < sites.size(); i += 700) {
+                    siteService.saveOrUpdateBatch(sites.subList(i, Math.min(i + 700, sites.size())));
+                }
             }
             List<TAccountingStrategy> accountingStrategies = data1.getAccountingStrategies();
             if (!accountingStrategies.isEmpty()) {

--
Gitblit v1.7.1