From 26526de10d49c3422a6d6c2d55fe5a2997786ad9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 13:58:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java | 872 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 636 insertions(+), 236 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 5fa4fe5..af942d8 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
@@ -1,24 +1,11 @@
package com.ruoyi.jianguan.util;
+import com.ruoyi.account.api.factory.JianGuanAccountFallbackFactory;
+import com.ruoyi.account.api.feignClient.JianGuanAccountClient;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.domain.SysOperLog;
import com.ruoyi.system.api.domain.SysUser;
-
-import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
-import com.ruoyi.other.api.domain.THtml;
-import com.ruoyi.other.api.domain.TCoupon;
-import com.ruoyi.other.api.domain.TSystemConfiguration;
-import com.ruoyi.other.api.domain.TVip;
-import com.ruoyi.other.api.domain.Operator;
-import com.ruoyi.other.api.domain.TGoods;
-import com.ruoyi.other.api.domain.TInvoiceType;
-import com.ruoyi.other.api.domain.TIntegralRule;
-import com.ruoyi.other.api.domain.TActivity;
-import com.ruoyi.other.api.domain.TAdvertising;
-import com.ruoyi.other.api.domain.TCompany;
-import com.ruoyi.other.api.domain.TEvaluationTag;
-import com.ruoyi.other.api.domain.TNotice;
-import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.order.api.model.AccountingStrategyDetailOrder;
import com.ruoyi.order.api.model.TOrderInvoice;
@@ -57,6 +44,9 @@
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.account.api.model.TAppUserSign;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
import java.util.List;
import com.ruoyi.account.api.model.TAppUserVipDetail;
@@ -69,7 +59,6 @@
import com.ruoyi.account.api.model.TAppUserIntegralChange;
import com.ruoyi.account.api.model.TAppUserTag;
-import com.ruoyi.account.api.feignClient.JianGuanAccountClient;
import com.ruoyi.account.api.vo.GovernmentCloudAccountVO;
import com.ruoyi.chargingPile.api.feignClient.JianGuanChargingPileClient;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -88,6 +77,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.stream.Collectors;
/**
@@ -276,399 +266,809 @@
@Resource
private JianGuanSystemClient jianGuanSystemClient;
- // 每两小时执行一次的定时任务
-// @Scheduled(cron = "0 0 0/2 * * ?")
+ public static void main(String[] args) {
+ LocalDate yesterday = LocalDate.now().minusDays(1);
+
+ LocalDateTime startOfDay = yesterday.atTime(0, 0, 0);
+ LocalDateTime endOfDay = yesterday.atTime(23, 59, 59);
+ // 转化为Date类型
+ Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+ Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+ System.err.println(startOfDay);
+ System.err.println(endOfDay);
+ }
+ // 每天下午3点执行的定时任务
+ @Scheduled(fixedRate = 86400000)
public void taskMonth() {
log.info("市政云传数据");
+ LocalDate yesterday = LocalDate.now().minusDays(1);
+
+ LocalDateTime startOfDay = yesterday.atTime(0, 0, 0);
+ LocalDateTime endOfDay = yesterday.atTime(23, 59, 59);
+ // 转化为Date类型
+ Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+ Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
// account服务
GovernmentCloudAccountVO data = jianGuanAccountClient.listAll().getData();
if (data != null) {
+ log.info("Account");
+
List<TAppCoupon> appCoupons = data.getAppCoupons();
if (!appCoupons.isEmpty()) {
- log.info("用户优惠券"+appCoupons);
- appCouponService.saveBatch(appCoupons);
+ log.info("用户优惠券"+appCoupons.size());
+ // 将id 设置为null
+ log.info("策略"+appCoupons.size());
+ appCoupons = appCoupons.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
+ log.info("用户"+appUsers.size());
+ appUsers = appUsers.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < appUsers.size(); i += 700) {
+ appUserService.saveOrUpdateBatch(appUsers.subList(i, Math.min(i + 700, appUsers.size())));
+ }
- appUserService.saveBatch(appUsers);
}
List<TAppUserAddress> appUserAddresses = data.getAppUserAddresses();
if (!appUserAddresses.isEmpty()) {
- log.info("用户地址"+appUserAddresses);
-
- appUserAddressService.saveBatch(appUserAddresses);
+ log.info("用户地址"+appUserAddresses.size());
+ appUserAddresses = appUserAddresses.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
-
- appUserCarService.saveBatch(appUserCars);
+ log.info("用户车辆"+appUserCars.size());
+ appUserCars = appUserCars.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
-
- appUserIntegralChangeService.saveBatch(appUserIntegralChanges);
+ log.info("用户积分变动"+appUserIntegralChanges.size());
+ appUserIntegralChanges = appUserIntegralChanges.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
-
- appUserSignService.saveBatch(appUserSigns);
+ log.info("用户签到"+appUserSigns.size());
+ appUserSigns = appUserSigns.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
+ log.info("用户标签"+appUserTags.size());
- appUserTagService.saveBatch(appUserTags);
+ appUserTags = appUserTags.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
+ log.info("用户会员明细"+appUserVipDetails.size());
- appUserVipDetailService.saveBatch(appUserVipDetails);
+ appUserVipDetails = appUserVipDetails.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
- inviteUserService.saveBatch(inviteUsers);
+ log.info("邀请用户"+inviteUsers.size());
+ inviteUsers = inviteUsers.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多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);
- tInvoiceInformationService.saveBatch(invoiceInformations);
+ log.info("开票"+invoiceInformations.size());
+ invoiceInformations = invoiceInformations.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < invoiceInformations.size(); i += 700) {
+ tInvoiceInformationService.saveOrUpdateBatch(invoiceInformations.subList(i, Math.min(i + 700, invoiceInformations.size())));
+ }
}
}
// chargingPile服务
GovernmentCloudChargingPileVO data1 = jianGuanChargingPileClient.listAll().getData();
if (data1 != null) {
+ log.info("chargingPile服务");
+
List<Partner> partners = data1.getPartners();
if (!partners.isEmpty()) {
- log.info("合作商"+partners);
+ log.info("合作商"+partners.size());
- partnerService.saveBatch(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);
+ log.info("站点"+sites.size());
- siteService.saveBatch(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()) {
- log.info("策略"+accountingStrategies);
-
- accountingStrategyService.saveBatch(accountingStrategies);
+ log.info("策略"+accountingStrategies.size());
+ // 筛选出昨天凌晨00:00:00到昨天晚上23:59:59的数据
+ accountingStrategies = accountingStrategies.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < accountingStrategies.size(); i += 700) {
+ accountingStrategyService.saveOrUpdateBatch(accountingStrategies.subList(i, Math.min(i + 700, accountingStrategies.size())));
+ }
}
List<TAccountingStrategyDetail> accountingStrategyDetails = data1.getAccountingStrategyDetails();
if (!accountingStrategyDetails.isEmpty()) {
- log.info("策略明细"+accountingStrategyDetails);
-
- accountingStrategyDetailService.saveBatch(accountingStrategyDetails);
+ log.info("策略明细"+accountingStrategyDetails.size());
+ accountingStrategyDetails = accountingStrategyDetails.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < accountingStrategies.size(); i += 700) {
+ accountingStrategyDetailService.saveOrUpdateBatch(accountingStrategyDetails.subList(i, Math.min(i + 700, accountingStrategyDetails.size())));
+ }
}
List<TApplyChargingPile> applyChargingPiles = data1.getApplyChargingPiles();
if (!applyChargingPiles.isEmpty()) {
- log.info("申请充电桩"+applyChargingPiles);
+ log.info("申请充电桩"+applyChargingPiles.size());
+ applyChargingPiles = applyChargingPiles.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
- applyChargingPileService.saveBatch(applyChargingPiles);
+ for (int i = 0; i < applyChargingPiles.size(); i += 700) {
+ applyChargingPileService.saveOrUpdateBatch(applyChargingPiles.subList(i, Math.min(i + 700, applyChargingPiles.size())));
+ }
}
List<TCarport> carports = data1.getCarports();
if (!carports.isEmpty()) {
- log.info("停车场"+carports);
-
- carportService.saveBatch(carports);
+ log.info("车库"+carports.size());
+ // 分批插入数据 每次最多700条
+ carports = carports.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < carports.size(); i += 700) {
+ carportService.saveOrUpdateBatch(carports.subList(i, Math.min(i + 700, carports.size())));
+ }
}
List<TChargingGun> chargingGuns = data1.getChargingGuns();
if (!chargingGuns.isEmpty()) {
- log.info("充电枪"+chargingGuns);
+ log.info("充电枪"+chargingGuns.size());
+ // 分批插入数据 每次最多700条
+ chargingGuns = chargingGuns.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingGuns.size(); i += 700) {
+ chargingGunService.saveOrUpdateBatch(chargingGuns.subList(i, Math.min(i + 700, chargingGuns.size())));
+ }
- chargingGunService.saveBatch(chargingGuns);
+ chargingGunService.saveOrUpdateBatch(chargingGuns);
}
List<TChargingPile> chargingPiles = data1.getChargingPiles();
if (!chargingPiles.isEmpty()) {
- log.info("充电桩"+chargingPiles);
+ log.info("充电桩"+chargingPiles.size());
+ // 分批插入数据 每次最多700条
+ chargingPiles = chargingPiles.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingPiles.size(); i += 700) {
+ chargingPileService.saveOrUpdateBatch(chargingPiles.subList(i, Math.min(i + 700, chargingPiles.size())));
+ }
- chargingPileService.saveBatch(chargingPiles);
}
List<TChargingPileNotification> chargingPileNotifications = data1.getChargingPileNotifications();
if (!chargingPileNotifications.isEmpty()) {
- log.info("通知"+chargingPileNotifications);
-
- chargingPileNotificationService.saveBatch(chargingPileNotifications);
+ log.info("充电桩通知"+chargingPileNotifications.size());
+ // 分批插入数据 每次最多700条
+ chargingPileNotifications = chargingPileNotifications.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingPileNotifications.size(); i += 700) {
+ chargingPileNotificationService.saveOrUpdateBatch(chargingPileNotifications.subList(i, Math.min(i + 700, chargingPileNotifications.size())));
+ }
}
List<TFaultMessage> faultMessages = data1.getFaultMessages();
if (!faultMessages.isEmpty()) {
- log.info("故障"+faultMessages);
-
- faultMessageService.saveBatch(faultMessages);
+ log.info("故障"+faultMessages.size());
+ // 分批插入数据 每次最多700条
+ faultMessages = faultMessages.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < faultMessages.size(); i += 700) {
+ faultMessageService.saveOrUpdateBatch(faultMessages.subList(i, Math.min(i + 700, faultMessages.size())));
+ }
}
List<TMonitoringEquipment> monitoringEquipments = data1.getMonitoringEquipments();
if (!monitoringEquipments.isEmpty()) {
- log.info("监控设备"+monitoringEquipments);
+ log.info("监控设备"+monitoringEquipments.size());
+ // 分批插入数据 每次最多700条
+ monitoringEquipments = monitoringEquipments.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < monitoringEquipments.size(); i += 700) {
+ monitoringEquipmentService.saveOrUpdateBatch(monitoringEquipments.subList(i, Math.min(i + 700, monitoringEquipments.size())));
- monitoringEquipmentService.saveBatch(monitoringEquipments);
+ }
}
List<TParkingLot> parkingLots = data1.getParkingLots();
if (!parkingLots.isEmpty()) {
- log.info("停车场"+parkingLots);
-
- parkingLotService.saveBatch(parkingLots);
+ log.info("停车场"+parkingLots.size());
+ // 分批插入数据 每次最多700条
+ parkingLots = parkingLots.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < parkingLots.size(); i += 700) {
+ parkingLotService.saveOrUpdateBatch(parkingLots.subList(i, Math.min(i + 700, parkingLots.size())));
+ }
}
List<TParkingRecord> parkingRecords = data1.getParkingRecords();
if (!parkingRecords.isEmpty()) {
- log.info("停车记录"+parkingRecords);
-
- parkingRecordService.saveBatch(parkingRecords);
+ log.info("停车记录"+parkingRecords.size());
+ // 分批插入数据 每次最多700条
+ parkingRecords = parkingRecords.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < parkingRecords.size(); i += 700) {
+ parkingRecordService.saveOrUpdateBatch(parkingRecords.subList(i, Math.min(i + 700, parkingRecords.size())));
+ }
}
-// List<TPartnerSite> partnerSites = data1.getPartnerSites();
-// if (!partnerSites.isEmpty()) {
-// partnerSiteService.saveBatch(partnerSites);
-// }
+ List<TPartnerSite> partnerSites = data1.getPartnerSites();
+ if (partnerSites!=null&&!partnerSites.isEmpty()) {
+ log.info("合作商站点"+parkingRecords.size());
+ // 分批插入数据 每次最多700条
+
+ for (int i = 0; i < partnerSites.size(); i += 700) {
+ partnerSiteService.saveOrUpdateBatch(partnerSites.subList(i, Math.min(i + 700, partnerSites.size())));
+ }
+ }
List<TRepair> repairs = data1.getRepairs();
if (!repairs.isEmpty()) {
- log.info("报修"+repairs);
-
- repairService.saveBatch(repairs);
+ log.info("报修"+repairs.size());
+ // 分批插入数据 每次最多700条
+ repairs = repairs.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < repairs.size(); i += 700) {
+ repairService.saveOrUpdateBatch(repairs.subList(i, Math.min(i + 700, repairs.size())));
+ }
}
-// List<TSiteMenu> siteMenus = data1.getSiteMenus();
-// if (!siteMenus.isEmpty()) {
-// siteMenuService.saveBatch(siteMenus);
-// }
+ List<TSiteMenu> siteMenus = data1.getSiteMenus();
+ if (siteMenus!=null&&!siteMenus.isEmpty()) {
+ log.info("站点菜单"+repairs.size());
+ // 分批插入数据 每次最多700条
+ siteMenus = siteMenus.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < siteMenus.size(); i += 700) {
+ siteMenuService.saveOrUpdateBatch(siteMenus.subList(i, Math.min(i + 700, siteMenus.size())));
+ }
+ }
List<TVehicleRamp> vehicleRamps = data1.getVehicleRamps();
if (!vehicleRamps.isEmpty()) {
- log.info("车道"+vehicleRamps);
-
- vehicleRampService.saveBatch(vehicleRamps);
+ log.info("车道"+vehicleRamps.size());
+ // 分批插入数据 每次最多700条
+ vehicleRamps = vehicleRamps.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < vehicleRamps.size(); i += 700) {
+ vehicleRampService.saveOrUpdateBatch(vehicleRamps.subList(i, Math.min(i + 700, vehicleRamps.size())));
+ }
}
}
//order服务
- GovernmentCloudOrderVO data2 = jianGuanOrderClient.listAll().getData();
-
-
- if (data2 != null) {
- List<AccountingStrategyDetailOrder> accountingStrategyDetailOrders = data2.getAccountingStrategyDetailOrders();
+// GovernmentCloudOrderVO data2 = jianGuanOrderClient.listAll().getData();
+ GovernmentCloudOrderVO dataOrder1 = jianGuanOrderClient.listAll1().getData();
+ GovernmentCloudOrderVO dataOrder2 = jianGuanOrderClient.listAll2().getData();
+ GovernmentCloudOrderVO dataOrder3 = jianGuanOrderClient.listAll3().getData();
+ GovernmentCloudOrderVO dataOrder4 = jianGuanOrderClient.listAll4().getData();
+ GovernmentCloudOrderVO dataOrder5 = jianGuanOrderClient.listAll5().getData();
+ GovernmentCloudOrderVO dataOrder6 = jianGuanOrderClient.listAll6().getData();
+ GovernmentCloudOrderVO dataOrder7 = jianGuanOrderClient.listAll7().getData();
+ GovernmentCloudOrderVO dataOrder8 = jianGuanOrderClient.listAll8().getData();
+ GovernmentCloudOrderVO dataOrder9 = jianGuanOrderClient.listAll9().getData();
+ GovernmentCloudOrderVO dataOrder10 = jianGuanOrderClient.listAll10().getData();
+ GovernmentCloudOrderVO dataOrder11 = jianGuanOrderClient.listAll11().getData();
+ GovernmentCloudOrderVO dataOrder12 = jianGuanOrderClient.listAll12().getData();
+ GovernmentCloudOrderVO dataOrder13 = jianGuanOrderClient.listAll13().getData();
+ GovernmentCloudOrderVO dataOrder14 = jianGuanOrderClient.listAll14().getData();
+ GovernmentCloudOrderVO dataOrder15 = jianGuanOrderClient.listAll15().getData();
+ GovernmentCloudOrderVO dataOrder16 = jianGuanOrderClient.listAll16().getData();
+ GovernmentCloudOrderVO dataOrder17 = jianGuanOrderClient.listAll17().getData();
+ GovernmentCloudOrderVO dataOrder18 = jianGuanOrderClient.listAll18().getData();
+ log.info("Order服务");
+ if (dataOrder1 != null) {
+ List<AccountingStrategyDetailOrder> accountingStrategyDetailOrders = dataOrder1.getAccountingStrategyDetailOrders();
if (!accountingStrategyDetailOrders.isEmpty()) {
- log.info("订单明细策略"+accountingStrategyDetailOrders);
-
- accountingStrategyDetailOrderService.saveBatch(accountingStrategyDetailOrders);
- }
- List<AccountingStrategyOrder> accountingStrategyOrders = data2.getAccountingStrategyOrders();
- if (!accountingStrategyOrders.isEmpty()) {
- log.info("订单策略"+accountingStrategyOrders);
-
- accountingStrategyOrderService.saveBatch(accountingStrategyOrders);
- }
- List<TChargingBill> chargingBills = data2.getChargingBills();
- if (!chargingBills.isEmpty()) {
- log.info("账单"+chargingBills);
-
- chargingBillService.saveBatch(chargingBills);
- }
- List<TChargingOrder> chargingOrders = data2.getChargingOrders();
- if (!chargingOrders.isEmpty()) {
- log.info("充电订单"+chargingOrders);
-
- chargingOrderService.saveBatch(chargingOrders);
- }
- List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = data2.getChargingOrderAccountingStrategies();
- if (!chargingOrderAccountingStrategies.isEmpty()) {
- log.info("充电订单策略"+chargingOrderAccountingStrategies);
-
- chargingOrderAccountingStrategyService.saveBatch(chargingOrderAccountingStrategies);
- }
- List<TChargingOrderRefund> chargingOrderRefunds = data2.getChargingOrderRefunds();
- if (!chargingOrderRefunds.isEmpty()) {
- log.info("充电订单退款"+chargingOrderRefunds);
-
- chargingOrderRefundService.saveBatch(chargingOrderRefunds);
- }
- List<TExchangeOrder> exchangeOrders = data2.getExchangeOrders();
- if (!exchangeOrders.isEmpty()) {
- log.info("兑换订单"+exchangeOrders);
-
- exchangeOrderService.saveBatch(exchangeOrders);
- }
- List<TGrantVip> grantVips = data2.getGrantVips();
- if (!grantVips.isEmpty()) {
- log.info("赠送vip"+grantVips);
-
- grantVipService.saveBatch(grantVips);
- }
- List<TOrderAppeal> orderAppeals = data2.getOrderAppeals();
- if (!orderAppeals.isEmpty()) {
- log.info("订单申诉"+orderAppeals);
-
- orderAppealService.saveBatch(orderAppeals);
- }
- List<TOrderEvaluate> orderEvaluates = data2.getOrderEvaluates();
- if (!orderEvaluates.isEmpty()) {
- log.info("订单评价"+orderEvaluates);
-
- orderEvaluateService.saveBatch(orderEvaluates);
- }
- List<TOrderEvaluateTag> orderEvaluateTags = data2.getOrderEvaluateTags();
- if (!orderEvaluateTags.isEmpty()) {
- log.info("订单评价标签"+orderEvaluateTags);
-
- orderEvaluateTagService.saveBatch(orderEvaluateTags);
- }
- List<TOrderInvoice> orderInvoices = data2.getOrderInvoices();
- if (!orderInvoices.isEmpty()) {
- log.info("订单开票"+orderInvoices);
-
- orderInvoiceService.saveBatch(orderInvoices);
- }
- List<TOrderInvoiceDetail> orderInvoiceDetails = data2.getOrderInvoiceDetails();
- if (!orderInvoiceDetails.isEmpty()) {
- log.info("订单开票明细"+orderInvoiceDetails);
-
- orderInvoiceDetailService.saveBatch(orderInvoiceDetails);
- }
- List<TSettlementConfirm> settlementConfirms = data2.getSettlementConfirms();
- if (!settlementConfirms.isEmpty()) {
- log.info("账单结算"+settlementConfirms);
-
- settlementConfirmService.saveBatch(settlementConfirms);
- }
- List<TShoppingOrder> shoppingOrders = data2.getShoppingOrders();
- if (!shoppingOrders.isEmpty()) {
- log.info("购物订单"+shoppingOrders);
-
- shoppingOrderService.saveBatch(shoppingOrders);
- }
- List<TShoppingOrderRefund> shoppingOrderRefunds = data2.getShoppingOrderRefunds();
- if (!shoppingOrderRefunds.isEmpty()) {
- log.info("购物订单退款"+shoppingOrderRefunds);
-
- shoppingOrderRefundService.saveBatch(shoppingOrderRefunds);
- }
- List<TVipOrder> vipOrders = data2.getVipOrders();
- if (!vipOrders.isEmpty()) {
- log.info("会员订单"+vipOrders);
-
- vipOrderService.saveBatch(vipOrders);
- }
- List<TVipOrderRefund> vipOrderRefunds = data2.getVipOrderRefunds();
- if (!vipOrderRefunds.isEmpty()) {
- log.info("会员订单退款"+vipOrderRefunds);
-
- vipOrderRefundService.saveBatch(vipOrderRefunds);
+ log.info("订单明细策略" + accountingStrategyDetailOrders.size());
+ // 分批插入数据 每次最多700条
+ accountingStrategyDetailOrders = accountingStrategyDetailOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < accountingStrategyDetailOrders.size(); i += 700) {
+ accountingStrategyDetailOrderService.saveOrUpdateBatch(accountingStrategyDetailOrders.subList(i, Math.min(i + 700, accountingStrategyDetailOrders.size())));
+ }
}
}
+ if (dataOrder2 != null) {
+ List<AccountingStrategyOrder> accountingStrategyOrders = dataOrder2.getAccountingStrategyOrders();
+ if (!accountingStrategyOrders.isEmpty()) {
+ log.info("订单策略" + accountingStrategyOrders.size());
+ // 分批插入数据 每次最多700条
+ int size = 700;
+ accountingStrategyOrders = accountingStrategyOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < accountingStrategyOrders.size(); i += size) {
+ List<AccountingStrategyOrder> subList = accountingStrategyOrders.subList(i, Math.min(i + size, accountingStrategyOrders.size()));
+ accountingStrategyOrderService.saveOrUpdateBatch(subList);
+ }
+ }
+ }
+ if (dataOrder3 != null) {
+ List<TChargingBill> chargingBills = dataOrder3.getChargingBills();
+ if (!chargingBills.isEmpty()) {
+ log.info("账单" + chargingBills.size());
+ // 分批插入数据 每次最多700条
+ // 分批插入数据 每次最多700条
+ chargingBills = chargingBills.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingBills.size(); i += 700) {
+ chargingBillService.saveOrUpdateBatch(chargingBills.subList(i, Math.min(i + 700, chargingBills.size())));
+ }
+
+ }
+ }
+ if (dataOrder4 != null) {
+ List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = dataOrder4.getChargingOrderAccountingStrategies();
+ if (!chargingOrderAccountingStrategies.isEmpty()) {
+ log.info("充电订单策略" + chargingOrderAccountingStrategies.size());
+ // 分批插入数据 每次最多700条
+ chargingOrderAccountingStrategies = chargingOrderAccountingStrategies.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingOrderAccountingStrategies.size(); i += 700) {
+ chargingOrderAccountingStrategyService.saveOrUpdateBatch(chargingOrderAccountingStrategies.subList(i, Math.min(i + 700, chargingOrderAccountingStrategies.size())));
+ }
+ }
+ }
+ if (dataOrder5 != null) {
+ List<TChargingOrderRefund> chargingOrderRefunds = dataOrder5.getChargingOrderRefunds();
+ if (!chargingOrderRefunds.isEmpty()) {
+ log.info("充电订单退款" + chargingOrderRefunds.size());
+
+ // 分批插入数据 每次最多700条
+ chargingOrderRefunds = chargingOrderRefunds.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingOrderRefunds.size(); i += 700) {
+ chargingOrderRefundService.saveOrUpdateBatch(chargingOrderRefunds.subList(i, Math.min(i + 700, chargingOrderRefunds.size())));
+ }
+ }
+ }
+ if (dataOrder6 != null) {
+ List<TChargingOrder> chargingOrders = dataOrder6.getChargingOrders();
+ if (!chargingOrders.isEmpty()) {
+ log.info("充电订单" + chargingOrders.size());
+ // 分批插入数据 每次最多700条
+ chargingOrders = chargingOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < chargingOrders.size(); i += 700) {
+ chargingOrderService.saveOrUpdateBatch(chargingOrders.subList(i, Math.min(i + 700, chargingOrders.size())));
+ }
+ }
+ }
+
+
+ if (dataOrder7 != null) {
+ List<TExchangeOrder> exchangeOrders = dataOrder7.getExchangeOrders();
+ if (!exchangeOrders.isEmpty()) {
+ log.info("兑换订单" + exchangeOrders.size());
+ exchangeOrders = exchangeOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < exchangeOrders.size(); i += 700) {
+ exchangeOrderService.saveOrUpdateBatch(exchangeOrders.subList(i, Math.min(i + 700, exchangeOrders.size())));
+ }
+ }
+ }
+ if (dataOrder8 != null) {
+ List<TGrantVip> grantVips = dataOrder8.getGrantVips();
+ if (!grantVips.isEmpty()) {
+ log.info("赠送vip" + grantVips.size());
+
+ // 分批插入数据 每次最多700条
+ grantVips = grantVips.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < grantVips.size(); i += 700) {
+ grantVipService.saveOrUpdateBatch(grantVips.subList(i, Math.min(i + 700, grantVips.size())));
+ }
+ }
+ }
+ if (dataOrder9 != null) {
+ List<TOrderAppeal> orderAppeals = dataOrder9.getOrderAppeals();
+ if (!orderAppeals.isEmpty()) {
+ log.info("订单申诉" + orderAppeals.size());
+ orderAppeals = orderAppeals.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < orderAppeals.size(); i += 700) {
+ orderAppealService.saveOrUpdateBatch(orderAppeals.subList(i, Math.min(i + 700, orderAppeals.size())));
+ }
+ }
+ }
+ if (dataOrder10 != null) {
+ List<TOrderEvaluate> orderEvaluates = dataOrder10.getOrderEvaluates();
+ if (!orderEvaluates.isEmpty()) {
+ log.info("订单评价"+orderEvaluates.size());
+ orderEvaluates = orderEvaluates.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < orderEvaluates.size(); i += 700) {
+ orderEvaluateService.saveOrUpdateBatch(orderEvaluates.subList(i, Math.min(i + 700, orderEvaluates.size())));
+ }
+ }
+ }
+ if (dataOrder11 != null) {
+ List<TOrderEvaluateTag> orderEvaluateTags = dataOrder11.getOrderEvaluateTags();
+ if (!orderEvaluateTags.isEmpty()) {
+ log.info("订单评价标签" + orderEvaluateTags.size());
+ // 分批插入数据 每次最多700条
+ orderEvaluateTags = orderEvaluateTags.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < orderEvaluateTags.size(); i += 700) {
+ orderEvaluateTagService.saveOrUpdateBatch(orderEvaluateTags.subList(i, Math.min(i + 700, orderEvaluateTags.size())));
+ }
+ }
+ }
+ if (dataOrder12 != null) {
+ List<TOrderInvoiceDetail> orderInvoiceDetails = dataOrder12.getOrderInvoiceDetails();
+ if (!orderInvoiceDetails.isEmpty()) {
+ log.info("订单开票明细" + orderInvoiceDetails.size());
+ // 分批插入数据 每次最多700条
+ orderInvoiceDetails = orderInvoiceDetails.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < orderInvoiceDetails.size(); i += 700) {
+ orderInvoiceDetailService.saveOrUpdateBatch(orderInvoiceDetails.subList(i, Math.min(i + 700, orderInvoiceDetails.size())));
+ }
+ }
+ }
+ if (dataOrder13 != null) {
+ List<TOrderInvoice> orderInvoices = dataOrder13.getOrderInvoices();
+ if (!orderInvoices.isEmpty()) {
+ log.info("订单开票" + orderInvoices.size());
+ orderInvoices = orderInvoices.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < orderInvoices.size(); i += 700) {
+ orderInvoiceService.saveOrUpdateBatch(orderInvoices.subList(i, Math.min(i + 700, orderInvoices.size())));
+ }
+ }
+ }
+
+ if (dataOrder14 != null) {
+ List<TSettlementConfirm> settlementConfirms = dataOrder14.getSettlementConfirms();
+ if (!settlementConfirms.isEmpty()) {
+ log.info("账单结算" + settlementConfirms.size());
+ settlementConfirms = settlementConfirms.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < settlementConfirms.size(); i += 700) {
+ settlementConfirmService.saveOrUpdateBatch(settlementConfirms.subList(i, Math.min(i + 700, settlementConfirms.size())));
+ }
+ }
+ }
+ if (dataOrder15 != null) {
+ List<TShoppingOrderRefund> shoppingOrderRefunds = dataOrder15.getShoppingOrderRefunds();
+ if (!shoppingOrderRefunds.isEmpty()) {
+ log.info("购物订单退款" + shoppingOrderRefunds.size());
+ // 分批插入数据 每次最多700条
+ shoppingOrderRefunds = shoppingOrderRefunds.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ for (int i = 0; i < shoppingOrderRefunds.size(); i += 700) {
+ shoppingOrderRefundService.saveOrUpdateBatch(shoppingOrderRefunds.subList(i, Math.min(i + 700, shoppingOrderRefunds.size())));
+ }
+ }
+ }
+ if (dataOrder16 != null) {
+ List<TVipOrderRefund> vipOrderRefunds = dataOrder16.getVipOrderRefunds();
+ if (!vipOrderRefunds.isEmpty()) {
+ log.info("会员订单退款" + vipOrderRefunds);
+ vipOrderRefunds = vipOrderRefunds.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < vipOrderRefunds.size(); i += 700) {
+ vipOrderRefundService.saveOrUpdateBatch(vipOrderRefunds.subList(i, Math.min(i + 700, vipOrderRefunds.size())));
+ }
+ }
+ }
+ if (dataOrder17 != null) {
+ List<TVipOrder> vipOrders = dataOrder17.getVipOrders();
+ if (!vipOrders.isEmpty()) {
+ log.info("会员订单" + vipOrders.size());
+ vipOrders = vipOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < vipOrders.size(); i += 700) {
+ vipOrderService.saveOrUpdateBatch(vipOrders.subList(i, Math.min(i + 700, vipOrders.size())));
+ }
+ }
+ }
+ if (dataOrder18 != null) {
+ List<TShoppingOrder> shoppingOrders = dataOrder18.getShoppingOrders();
+ if (!shoppingOrders.isEmpty()) {
+ log.info("购物订单" + shoppingOrders.size());
+ shoppingOrders = shoppingOrders.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < shoppingOrders.size(); i += 700) {
+ shoppingOrderService.saveOrUpdateBatch(shoppingOrders.subList(i, Math.min(i + 700, shoppingOrders.size())));
+ }
+ }
+ }
+
+
+
+
// other服务
GovernmentCloudOtherVO data3 = jianGuanOtherClient.listAll().getData();
if (data3 != null) {
+ log.info("other服务");
+
List<Operator> operators = data3.getOperators();
if (!operators.isEmpty()) {
- log.info("运营商"+operators);
+ log.info("运营商"+operators.size());
operatorService.saveOrUpdateBatch(operators);
}
List<TActivity> activities = data3.getActivities();
if (!activities.isEmpty()) {
- log.info("活动"+activities);
+ log.info("活动"+activities.size());
- activityService.saveBatch(activities);
+ activityService.saveOrUpdateBatch(activities);
}
List<TAdvertising> advertisings = data3.getAdvertisings();
if (!advertisings.isEmpty()) {
- log.info("广告"+advertisings);
+ log.info("广告"+advertisings.size());
- advertisingService.saveBatch(advertisings);
+ advertisingService.saveOrUpdateBatch(advertisings);
}
List<TCompany> companies = data3.getCompanies();
if (!companies.isEmpty()) {
- log.info("公司"+companies);
+ log.info("公司"+companies.size());
- companyService.saveBatch(companies);
+ companyService.saveOrUpdateBatch(companies);
}
List<TCoupon> coupons = data3.getCoupons();
if (!coupons.isEmpty()) {
- log.info("优惠券"+coupons);
+ log.info("优惠券"+coupons.size());
- couponService.saveBatch(coupons);
+ couponService.saveOrUpdateBatch(coupons);
}
List<TEnterpriseUserApplication> enterpriseUserApplications = data3.getEnterpriseUserApplications();
if (!enterpriseUserApplications.isEmpty()) {
- log.info("公司申请"+enterpriseUserApplications);
+ log.info("公司申请"+enterpriseUserApplications.size());
- enterpriseUserApplicationService.saveBatch(enterpriseUserApplications);
+ enterpriseUserApplicationService.saveOrUpdateBatch(enterpriseUserApplications);
}
List<TEvaluationTag> evaluationTags = data3.getEvaluationTags();
if (!evaluationTags.isEmpty()) {
- log.info("评价标签"+evaluationTags);
+ log.info("评价标签"+evaluationTags.size());
- evaluationTagService.saveBatch(evaluationTags);
+ evaluationTagService.saveOrUpdateBatch(evaluationTags);
}
List<TGoods> goods = data3.getGoods();
if (!goods.isEmpty()) {
- log.info("商品"+goods);
+ log.info("商品"+goods.size());
- goodsService.saveBatch(goods);
+ goodsService.saveOrUpdateBatch(goods);
}
List<THtml> htmls = data3.getHtmls();
if (!htmls.isEmpty()) {
- log.info("html"+htmls);
+ log.info("html"+htmls.size());
htmlService.saveOrUpdateBatch(htmls);
}
List<TIntegralRule> integralRules = data3.getIntegralRules();
if (!integralRules.isEmpty()) {
- log.info("积分规则"+integralRules);
+ log.info("积分规则"+integralRules.size());
- integralRuleService.saveBatch(integralRules);
+ integralRuleService.saveOrUpdateBatch(integralRules);
}
List<TInvoiceType> invoiceTypes = data3.getInvoiceTypes();
if (!invoiceTypes.isEmpty()) {
- log.info("开票类型"+invoiceTypes);
+ log.info("开票类型"+invoiceTypes.size());
- invoiceTypeService.saveBatch(invoiceTypes);
+ invoiceTypeService.saveOrUpdateBatch(invoiceTypes);
}
List<TNotice> notices = data3.getNotices();
if (!notices.isEmpty()) {
- log.info("通知"+notices);
-
- noticeService.saveBatch(notices);
+ log.info("通知"+notices.size());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < notices.size(); i += 700) {
+ noticeService.saveOrUpdateBatch(notices.subList(i, Math.min(i + 700, notices.size())));
+ }
}
List<TSystemConfiguration> systemConfigurations = data3.getSystemConfigurations();
if (!systemConfigurations.isEmpty()) {
- log.info("系统设置"+systemConfigurations);
+ log.info("系统设置"+systemConfigurations.size());
+
systemConfigurationService.saveOrUpdateBatch(systemConfigurations);
}
List<TUserTag> userTags = data3.getUserTags();
if (!userTags.isEmpty()) {
- log.info("用户标签"+userTags);
- userTagService.saveBatch(userTags);
+ log.info("用户标签"+userTags.size());
+
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < userTags.size(); i += 700) {
+ userTagService.saveOrUpdateBatch(userTags.subList(i, Math.min(i + 700, userTags.size())));
+ }
}
List<TVip> vips = data3.getVips();
if (!vips.isEmpty()) {
- log.info("会员"+vips);
- vipService.saveBatch(vips);
+ log.info("会员"+vips.size());
+
+ vipService.saveOrUpdateBatch(vips);
+ }
+ List<TUserSite> userSites = data3.getUserSites();
+ if (userSites!=null&&!userSites.isEmpty()) {
+ log.info("用户站点"+userSites.size());
+
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < userTags.size(); i += 700) {
+ userSiteService.saveOrUpdateBatch(userSites.subList(i, Math.min(i + 700, userSites.size())));
+ }
+ }
+ List<TRoleSite> roleSites = data3.getRoleSites();
+ if (roleSites!=null&&!userSites.isEmpty()) {
+ log.info("角色站点"+userSites.size());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < roleSites.size(); i += 700) {
+ roleSiteService.saveOrUpdateBatch(roleSites.subList(i, Math.min(i + 700, roleSites.size())));
+ }
}
}
GovernmentCloudSystemVO data4 = jianGuanSystemClient.listAll().getData();
if (data4 != null) {
+ log.info("System服务");
+
List<SysLoginLog> loginLogs = data4.getLoginLogs();
if (!loginLogs.isEmpty()) {
- log.info("登录日志"+loginLogs);
- sysLoginLogService.saveBatch(loginLogs);
+ log.info("登录日志"+loginLogs.size());
+ loginLogs = loginLogs.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < loginLogs.size(); i += 700) {
+ sysLoginLogService.saveOrUpdateBatch(loginLogs.subList(i, Math.min(i + 700, loginLogs.size())));
+ }
}
List<SysOperLog> sysOperLogs = data4.getSysOperLogs();
if (!sysOperLogs.isEmpty()) {
- log.info("操作日志"+sysOperLogs);
- sysOperLogService.saveBatch(sysOperLogs);
+ log.info("操作日志"+sysOperLogs.size());
+ sysOperLogs = sysOperLogs.stream()
+ .filter(accountingStrategy -> accountingStrategy.getOperTime().after(startDate))
+ .filter(accountingStrategy -> accountingStrategy.getOperTime().before(endDate))
+ .collect(Collectors.toList());
+ // 分批插入数据 每次最多700条
+ for (int i = 0; i < sysOperLogs.size(); i += 700) {
+ sysOperLogService.saveOrUpdateBatch(sysOperLogs.subList(i, Math.min(i + 700, sysOperLogs.size())));
+ }
}
List<SysRole> sysRoles = data4.getSysRoles();
if (!sysRoles.isEmpty()) {
- log.info("角色"+sysRoles);
- sysRoleService.saveBatch(sysRoles);
+ log.info("角色"+sysRoles.size());
+
+ sysRoleService.saveOrUpdateBatch(sysRoles);
}
List<SysUser> sysUsers = data4.getSysUsers();
if (!sysUsers.isEmpty()) {
- log.info("系统用户"+sysUsers);
- sysUserService.saveBatch(sysUsers);
+ log.info("系统用户"+sysUsers.size());
+
+ sysUserService.saveOrUpdateBatch(sysUsers);
}
}
}
--
Gitblit v1.7.1