政务云数据上传bug修改

无关风月

昨天 8b48244257eaa19bfd8a761b3d2309cea25a8aaa

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java

@@ -284,142 +284,146 @@
        // account服务
        GovernmentCloudAccountVO data = jianGuanAccountClient.listAll().getData();
        if (data != null) {
            log.info("Account"+data);

            List<TAppCoupon> appCoupons = data.getAppCoupons();
            if (!appCoupons.isEmpty()) {
                log.info("用户优惠券"+appCoupons);
                log.info("用户优惠券"+appCoupons.size());
                appCouponService.saveBatch(appCoupons);
            }
            List<TAppUser> appUsers = data.getAppUsers();
            if (!appUsers.isEmpty()) {
                log.info("用户"+appUsers);
                log.info("用户"+appUsers.size());

                appUserService.saveBatch(appUsers);
            }
            List<TAppUserAddress> appUserAddresses = data.getAppUserAddresses();
            if (!appUserAddresses.isEmpty()) {
                log.info("用户地址"+appUserAddresses);
                log.info("用户地址"+appUserAddresses.size());

                appUserAddressService.saveBatch(appUserAddresses);
            }
            List<TAppUserCar> appUserCars = data.getAppUserCars();
            if (!appUserCars.isEmpty()) {
                log.info("用户车辆"+appUserCars);
                log.info("用户车辆"+appUserCars.size());

                appUserCarService.saveBatch(appUserCars);
            }
            List<TAppUserIntegralChange> appUserIntegralChanges = data.getAppUserIntegralChanges();
            if (!appUserIntegralChanges.isEmpty()) {
                log.info("用户积分变动"+appUserIntegralChanges);
                log.info("用户积分变动"+appUserIntegralChanges.size());

                appUserIntegralChangeService.saveBatch(appUserIntegralChanges);
            }
            List<TAppUserSign> appUserSigns = data.getAppUserSigns();
            if (!appUserSigns.isEmpty()) {
                log.info("用户签到"+appUserSigns);
                log.info("用户签到"+appUserSigns.size());

                appUserSignService.saveBatch(appUserSigns);
            }
            List<TAppUserTag> appUserTags = data.getAppUserTags();
            if (!appUserTags.isEmpty()) {
                log.info("用户标签"+appUserTags);
                log.info("用户标签"+appUserTags.size());

                appUserTagService.saveBatch(appUserTags);
            }
            List<TAppUserVipDetail> appUserVipDetails = data.getAppUserVipDetails();
            if (!appUserVipDetails.isEmpty()) {
                log.info("用户会员明细"+appUserVipDetails);
                log.info("用户会员明细"+appUserVipDetails.size());

                appUserVipDetailService.saveBatch(appUserVipDetails);
            }
            List<TInviteUser> inviteUsers = data.getInviteUsers();
            if (!inviteUsers.isEmpty()) {
                log.info("邀请用户"+inviteUsers);
                log.info("邀请用户"+inviteUsers.size());
                inviteUserService.saveBatch(inviteUsers);
            }
            List<TInvoiceInformation> invoiceInformations = data.getInvoiceInformations();
            if (!invoiceInformations.isEmpty()) {
                log.info("开票"+invoiceInformations);
                log.info("开票"+invoiceInformations.size());
                tInvoiceInformationService.saveBatch(invoiceInformations);
            }
        }
        // chargingPile服务
        GovernmentCloudChargingPileVO data1 = jianGuanChargingPileClient.listAll().getData();
        if (data1 != null) {
            log.info("ChargingPile"+data1);

            List<Partner> partners = data1.getPartners();
            if (!partners.isEmpty()) {
                log.info("合作商"+partners);
                log.info("合作商"+partners.size());

                partnerService.saveBatch(partners);
            }
            List<Site> sites = data1.getSites();
            if (!sites.isEmpty()) {
                log.info("站点"+sites);
                log.info("站点"+sites.size());

                siteService.saveBatch(sites);
            }
            List<TAccountingStrategy> accountingStrategies = data1.getAccountingStrategies();
            if (!accountingStrategies.isEmpty()) {
                log.info("策略"+accountingStrategies);
                log.info("策略"+accountingStrategies.size());

                accountingStrategyService.saveBatch(accountingStrategies);
            }
            List<TAccountingStrategyDetail> accountingStrategyDetails = data1.getAccountingStrategyDetails();
            if (!accountingStrategyDetails.isEmpty()) {
                log.info("策略明细"+accountingStrategyDetails);
                log.info("策略明细"+accountingStrategyDetails.size());

                accountingStrategyDetailService.saveBatch(accountingStrategyDetails);
            }
            List<TApplyChargingPile> applyChargingPiles = data1.getApplyChargingPiles();
            if (!applyChargingPiles.isEmpty()) {
                log.info("申请充电桩"+applyChargingPiles);
                log.info("申请充电桩"+applyChargingPiles.size());

                applyChargingPileService.saveBatch(applyChargingPiles);
            }
            List<TCarport> carports = data1.getCarports();
            if (!carports.isEmpty()) {
                log.info("停车场"+carports);
                log.info("停车场"+carports.size());

                carportService.saveBatch(carports);
            }
            List<TChargingGun> chargingGuns = data1.getChargingGuns();
            if (!chargingGuns.isEmpty()) {
                log.info("充电枪"+chargingGuns);
                log.info("充电枪"+chargingGuns.size());

                chargingGunService.saveBatch(chargingGuns);
            }
            List<TChargingPile> chargingPiles = data1.getChargingPiles();
            if (!chargingPiles.isEmpty()) {
                log.info("充电桩"+chargingPiles);
                log.info("充电桩"+chargingPiles.size());

                chargingPileService.saveBatch(chargingPiles);
            }
            List<TChargingPileNotification> chargingPileNotifications = data1.getChargingPileNotifications();
            if (!chargingPileNotifications.isEmpty()) {
                log.info("通知"+chargingPileNotifications);
                log.info("通知"+chargingPileNotifications.size());

                chargingPileNotificationService.saveBatch(chargingPileNotifications);
            }
            List<TFaultMessage> faultMessages = data1.getFaultMessages();
            if (!faultMessages.isEmpty()) {
                log.info("故障"+faultMessages);
                log.info("故障"+faultMessages.size());

                faultMessageService.saveBatch(faultMessages);
            }
            List<TMonitoringEquipment> monitoringEquipments = data1.getMonitoringEquipments();
            if (!monitoringEquipments.isEmpty()) {
                log.info("监控设备"+monitoringEquipments);
                log.info("监控设备"+monitoringEquipments.size());

                monitoringEquipmentService.saveBatch(monitoringEquipments);
            }
            List<TParkingLot> parkingLots = data1.getParkingLots();
            if (!parkingLots.isEmpty()) {
                log.info("停车场"+parkingLots);
                log.info("停车场"+parkingLots.size());

                parkingLotService.saveBatch(parkingLots);
            }
            List<TParkingRecord> parkingRecords = data1.getParkingRecords();
            if (!parkingRecords.isEmpty()) {
                log.info("停车记录"+parkingRecords);
                log.info("停车记录"+parkingRecords.size());

                parkingRecordService.saveBatch(parkingRecords);
            }
@@ -429,7 +433,7 @@
//            }
            List<TRepair> repairs = data1.getRepairs();
            if (!repairs.isEmpty()) {
                log.info("报修"+repairs);
                log.info("报修"+repairs.size());

                repairService.saveBatch(repairs);
            }
@@ -439,115 +443,114 @@
//            }
            List<TVehicleRamp> vehicleRamps = data1.getVehicleRamps();
            if (!vehicleRamps.isEmpty()) {
                log.info("车道"+vehicleRamps);
                log.info("车道"+vehicleRamps.size());

                vehicleRampService.saveBatch(vehicleRamps);
            }
        }
        //order服务
        GovernmentCloudOrderVO data2 = jianGuanOrderClient.listAll().getData();


        if (data2 != null) {
            log.info("Order"+data2);
            List<AccountingStrategyDetailOrder> accountingStrategyDetailOrders = data2.getAccountingStrategyDetailOrders();
            if (!accountingStrategyDetailOrders.isEmpty()) {
                log.info("订单明细策略"+accountingStrategyDetailOrders);
                log.info("订单明细策略"+accountingStrategyDetailOrders.size());

                accountingStrategyDetailOrderService.saveBatch(accountingStrategyDetailOrders);
            }
            List<AccountingStrategyOrder> accountingStrategyOrders = data2.getAccountingStrategyOrders();
            if (!accountingStrategyOrders.isEmpty()) {
                log.info("订单策略"+accountingStrategyOrders);
                log.info("订单策略"+accountingStrategyOrders.size());

                accountingStrategyOrderService.saveBatch(accountingStrategyOrders);
            }
            List<TChargingBill> chargingBills = data2.getChargingBills();
            if (!chargingBills.isEmpty()) {
                log.info("账单"+chargingBills);
                log.info("账单"+chargingBills.size());

                chargingBillService.saveBatch(chargingBills);
            }
            List<TChargingOrder> chargingOrders = data2.getChargingOrders();
            if (!chargingOrders.isEmpty()) {
                log.info("充电订单"+chargingOrders);
                log.info("充电订单"+chargingOrders.size());

                chargingOrderService.saveBatch(chargingOrders);
            }
            List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = data2.getChargingOrderAccountingStrategies();
            if (!chargingOrderAccountingStrategies.isEmpty()) {
                log.info("充电订单策略"+chargingOrderAccountingStrategies);
                log.info("充电订单策略"+chargingOrderAccountingStrategies.size());

                chargingOrderAccountingStrategyService.saveBatch(chargingOrderAccountingStrategies);
            }
            List<TChargingOrderRefund> chargingOrderRefunds = data2.getChargingOrderRefunds();
            if (!chargingOrderRefunds.isEmpty()) {
                log.info("充电订单退款"+chargingOrderRefunds);
                log.info("充电订单退款"+chargingOrderRefunds.size());

                chargingOrderRefundService.saveBatch(chargingOrderRefunds);
            }
            List<TExchangeOrder> exchangeOrders = data2.getExchangeOrders();
            if (!exchangeOrders.isEmpty()) {
                log.info("兑换订单"+exchangeOrders);
                log.info("兑换订单"+exchangeOrders.size());

                exchangeOrderService.saveBatch(exchangeOrders);
            }
            List<TGrantVip> grantVips = data2.getGrantVips();
            if (!grantVips.isEmpty()) {
                log.info("赠送vip"+grantVips);
                log.info("赠送vip"+grantVips.size());

                grantVipService.saveBatch(grantVips);
            }
            List<TOrderAppeal> orderAppeals = data2.getOrderAppeals();
            if (!orderAppeals.isEmpty()) {
                log.info("订单申诉"+orderAppeals);
                log.info("订单申诉"+orderAppeals.size());

                orderAppealService.saveBatch(orderAppeals);
            }
            List<TOrderEvaluate> orderEvaluates = data2.getOrderEvaluates();
            if (!orderEvaluates.isEmpty()) {
                log.info("订单评价"+orderEvaluates);
                log.info("订单评价"+orderEvaluates.size());

                orderEvaluateService.saveBatch(orderEvaluates);
            }
            List<TOrderEvaluateTag> orderEvaluateTags = data2.getOrderEvaluateTags();
            if (!orderEvaluateTags.isEmpty()) {
                log.info("订单评价标签"+orderEvaluateTags);
                log.info("订单评价标签"+orderEvaluateTags.size());

                orderEvaluateTagService.saveBatch(orderEvaluateTags);
            }
            List<TOrderInvoice> orderInvoices = data2.getOrderInvoices();
            if (!orderInvoices.isEmpty()) {
                log.info("订单开票"+orderInvoices);
                log.info("订单开票"+orderInvoices.size());

                orderInvoiceService.saveBatch(orderInvoices);
            }
            List<TOrderInvoiceDetail> orderInvoiceDetails = data2.getOrderInvoiceDetails();
            if (!orderInvoiceDetails.isEmpty()) {
                log.info("订单开票明细"+orderInvoiceDetails);
                log.info("订单开票明细"+orderInvoiceDetails.size());

                orderInvoiceDetailService.saveBatch(orderInvoiceDetails);
            }
            List<TSettlementConfirm> settlementConfirms = data2.getSettlementConfirms();
            if (!settlementConfirms.isEmpty()) {
                log.info("账单结算"+settlementConfirms);
                log.info("账单结算"+settlementConfirms.size());

                settlementConfirmService.saveBatch(settlementConfirms);
            }
            List<TShoppingOrder> shoppingOrders = data2.getShoppingOrders();
            if (!shoppingOrders.isEmpty()) {
                log.info("购物订单"+shoppingOrders);
                log.info("购物订单"+shoppingOrders.size());

                shoppingOrderService.saveBatch(shoppingOrders);
            }
            List<TShoppingOrderRefund> shoppingOrderRefunds = data2.getShoppingOrderRefunds();
            if (!shoppingOrderRefunds.isEmpty()) {
                log.info("购物订单退款"+shoppingOrderRefunds);
                log.info("购物订单退款"+shoppingOrderRefunds.size());

                shoppingOrderRefundService.saveBatch(shoppingOrderRefunds);
            }
            List<TVipOrder> vipOrders = data2.getVipOrders();
            if (!vipOrders.isEmpty()) {
                log.info("会员订单"+vipOrders);
                log.info("会员订单"+vipOrders.size());

                vipOrderService.saveBatch(vipOrders);
            }
@@ -561,114 +564,118 @@
        // other服务
        GovernmentCloudOtherVO data3 = jianGuanOtherClient.listAll().getData();
        if (data3 != null) {
            log.info("other"+data3);

            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);
            }
            List<TAdvertising> advertisings = data3.getAdvertisings();
            if (!advertisings.isEmpty()) {
                log.info("广告"+advertisings);
                log.info("广告"+advertisings.size());

                advertisingService.saveBatch(advertisings);
            }
            List<TCompany> companies = data3.getCompanies();
            if (!companies.isEmpty()) {
                log.info("公司"+companies);
                log.info("公司"+companies.size());

                companyService.saveBatch(companies);
            }
            List<TCoupon> coupons = data3.getCoupons();
            if (!coupons.isEmpty()) {
                log.info("优惠券"+coupons);
                log.info("优惠券"+coupons.size());

                couponService.saveBatch(coupons);
            }
            List<TEnterpriseUserApplication> enterpriseUserApplications = data3.getEnterpriseUserApplications();
            if (!enterpriseUserApplications.isEmpty()) {
                log.info("公司申请"+enterpriseUserApplications);
                log.info("公司申请"+enterpriseUserApplications.size());

                enterpriseUserApplicationService.saveBatch(enterpriseUserApplications);
            }
            List<TEvaluationTag> evaluationTags = data3.getEvaluationTags();
            if (!evaluationTags.isEmpty()) {
                log.info("评价标签"+evaluationTags);
                log.info("评价标签"+evaluationTags.size());

                evaluationTagService.saveBatch(evaluationTags);
            }
            List<TGoods> goods = data3.getGoods();
            if (!goods.isEmpty()) {
                log.info("商品"+goods);
                log.info("商品"+goods.size());

                goodsService.saveBatch(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);
            }
            List<TInvoiceType> invoiceTypes = data3.getInvoiceTypes();
            if (!invoiceTypes.isEmpty()) {
                log.info("开票类型"+invoiceTypes);
                log.info("开票类型"+invoiceTypes.size());

                invoiceTypeService.saveBatch(invoiceTypes);
            }
            List<TNotice> notices = data3.getNotices();
            if (!notices.isEmpty()) {
                log.info("通知"+notices);
                log.info("通知"+notices.size());

                noticeService.saveBatch(notices);
            }
            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);
                log.info("用户标签"+userTags.size());
                userTagService.saveBatch(userTags);
            }
            List<TVip> vips = data3.getVips();
            if (!vips.isEmpty()) {
                log.info("会员"+vips);
                log.info("会员"+vips.size());
                vipService.saveBatch(vips);
            }
        }
        GovernmentCloudSystemVO data4 = jianGuanSystemClient.listAll().getData();
        if (data4 != null) {
            log.info("System"+data4);

            List<SysLoginLog> loginLogs = data4.getLoginLogs();
            if (!loginLogs.isEmpty()) {
                log.info("登录日志"+loginLogs);
                log.info("登录日志"+loginLogs.size());
                sysLoginLogService.saveBatch(loginLogs);
            }
            List<SysOperLog> sysOperLogs = data4.getSysOperLogs();
            if (!sysOperLogs.isEmpty()) {
                log.info("操作日志"+sysOperLogs);
                log.info("操作日志"+sysOperLogs.size());
                sysOperLogService.saveBatch(sysOperLogs);
            }
            List<SysRole> sysRoles = data4.getSysRoles();
            if (!sysRoles.isEmpty()) {
                log.info("角色"+sysRoles);
                log.info("角色"+sysRoles.size());
                sysRoleService.saveBatch(sysRoles);
            }
            List<SysUser> sysUsers = data4.getSysUsers();
            if (!sysUsers.isEmpty()) {
                log.info("系统用户"+sysUsers);
                log.info("系统用户"+sysUsers.size());
                sysUserService.saveBatch(sysUsers);
            }
        }