ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java
@@ -57,44 +57,34 @@ String end = LocalDate.now().minusDays(1)+" 23:59:59"; GovernmentCloudAccountVO governmentCloudAccountVO = new GovernmentCloudAccountVO(); List<TAppCoupon> list1 = tAppCouponService.lambdaQuery() .ge(TAppCoupon::getCreateTime, start) .le(TAppCoupon::getCreateTime, end) .list(); List<TAppUser> list2 = appUserService.lambdaQuery() .ge(TAppUser::getCreateTime, start) .le(TAppUser::getCreateTime, end) .list(); List<TAppUserAddress> list3 = appUserAddressService.lambdaQuery() .ge(TAppUserAddress::getCreateTime, start) .le(TAppUserAddress::getCreateTime, end) .list(); List<TAppUserCar> list4 = appUserCarService.lambdaQuery() .ge(TAppUserCar::getCreateTime, start) .le(TAppUserCar::getCreateTime, end) .list(); List<TAppUserIntegralChange> list5 = appUserIntegralChangeService.lambdaQuery() .ge(TAppUserIntegralChange::getCreateTime, start) .le(TAppUserIntegralChange::getCreateTime, end) .list(); List<TAppUserSign> list6 = appUserSignService.lambdaQuery() .ge(TAppUserSign::getCreateTime, start) .le(TAppUserSign::getCreateTime, end) .list(); List<TAppUserTag> list7 = appUserTagService.lambdaQuery() .ge(TAppUserTag::getCreateTime, start) .le(TAppUserTag::getCreateTime, end) .list(); List<TAppUserVipDetail> list8 = appUserVipDetailService.lambdaQuery() .ge(TAppUserVipDetail::getCreateTime, start) .le(TAppUserVipDetail::getCreateTime, end) .list(); List<TInviteUser> list9 = inviteUserService.lambdaQuery() .ge(TInviteUser::getCreateTime, start) .le(TInviteUser::getCreateTime, end) .list(); List<TInvoiceInformation> list10 = invoiceInformationService.lambdaQuery() .ge(TInvoiceInformation::getCreateTime, start) .le(TInvoiceInformation::getCreateTime, end) .list(); for (TAppUserSign tAppUserSign : list6) { tAppUserSign.setSignDay(null); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
@@ -70,58 +70,56 @@ */ @PostMapping("/listAll") R<GovernmentCloudChargingPileVO> listAll() { String start = LocalDate.now().minusDays(1)+" 00:00:00"; String end = LocalDate.now().minusDays(1)+" 23:59:59"; GovernmentCloudChargingPileVO governmentCloudAccountVO = new GovernmentCloudChargingPileVO(); List<Partner> list1 = partnerService.lambdaQuery() .ge(Partner::getCreateTime,start) .le(Partner::getCreateTime,end) .list(); List<Site> list2 = siteService.lambdaQuery() .ge(Site::getCreateTime,start) .le(Site::getCreateTime,end) .list(); List<TAccountingStrategyDetail> list3 = accountingStrategyDetailService.lambdaQuery() .ge(TAccountingStrategyDetail::getCreateTime,start) .le(TAccountingStrategyDetail::getCreateTime,end) .list(); .list(); List<TAccountingStrategy> list4 = accountingStrategyService.lambdaQuery() .ge(TAccountingStrategy::getCreateTime,start) .le(TAccountingStrategy::getCreateTime,end) .list(); .list(); List<TApplyChargingPile> list5 = applyChargingPileService.lambdaQuery() .ge(TApplyChargingPile::getCreateTime,start) .le(TApplyChargingPile::getCreateTime,end) .list(); .list(); List<TCarport> list6 = carportService.lambdaQuery() .ge(TCarport::getCreateTime,start) .le(TCarport::getCreateTime,end) .list(); .list(); List<TChargingGun> list7 = chargingGunService.lambdaQuery() .ge(TChargingGun::getCreateTime,start) .le(TChargingGun::getCreateTime,end) .list(); .list(); List<TChargingPile> list8 = chargingPileService.lambdaQuery() .ge(TChargingPile::getCreateTime,start) .le(TChargingPile::getCreateTime,end) .list(); .list(); List<TChargingPileNotification> list9 = chargingPileNotificationService.lambdaQuery() .ge(TChargingPileNotification::getCreateTime,start) .le(TChargingPileNotification::getCreateTime,end) .list(); .list(); List<TFaultMessage> list10 = faultMessageService.lambdaQuery() .ge(TFaultMessage::getCreateTime,start) .le(TFaultMessage::getCreateTime,end) .list(); .list(); List<TMonitoringEquipment> list11 = monitoringEquipmentService.lambdaQuery() .ge(TMonitoringEquipment::getCreateTime,start) .le(TMonitoringEquipment::getCreateTime,end) .list(); .list(); List<TParkingLot> list12 = parkingLotService.lambdaQuery() .ge(TParkingLot::getCreateTime,start) .le(TParkingLot::getCreateTime,end) .list(); .list(); List<TParkingRecord> list13 = parkingRecordService.lambdaQuery() .ge(TParkingRecord::getCreateTime,start) .le(TParkingRecord::getCreateTime,end) .list(); .list(); List<TPartnerSite> list14 = partnerSiteService.list(); List<TRepair> list15 = repairService.lambdaQuery() .ge(TRepair::getCreateTime,start) .le(TRepair::getCreateTime,end) .list(); .list(); List<TVehicleRamp> list16 = vehicleRampService.lambdaQuery() .ge(TVehicleRamp::getCreateTime,start) .le(TVehicleRamp::getCreateTime,end) .list(); List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list(); .list(); List<TSiteMenu> list17 = siteMenuService.lambdaQuery() .list(); governmentCloudAccountVO.setPartners(list1); governmentCloudAccountVO.setSites(list2); 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()) {
