明星电力充电桩
parent: 1d5c4e55 | 补丁 | 提交 | show whitespace
Pu Zhibing
6 天以前 8762c5e487c60724323c7f8bc1ba9517d57a4c37 
Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
1个文件已添加
1个文件已修改
161 ■■■■■ 已修改文件
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java


@@ -300,7 +300,7 @@


                // 将id 设置为null


                log.info("策略"+appCoupons.size());


                appCoupons = appCoupons.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -312,7 +312,7 @@


            if (!appUsers.isEmpty()) {


                log.info("用户"+appUsers.size());


                appUsers = appUsers.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -325,7 +325,7 @@


            if (!appUserAddresses.isEmpty()) {


                log.info("用户地址"+appUserAddresses.size());


                appUserAddresses = appUserAddresses.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -337,7 +337,7 @@


            if (!appUserCars.isEmpty()) {


                log.info("用户车辆"+appUserCars.size());


                appUserCars = appUserCars.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -349,7 +349,7 @@


            if (!appUserIntegralChanges.isEmpty()) {


                log.info("用户积分变动"+appUserIntegralChanges.size());


                appUserIntegralChanges = appUserIntegralChanges.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -361,7 +361,7 @@


            if (!appUserSigns.isEmpty()) {


                log.info("用户签到"+appUserSigns.size());


                appUserSigns = appUserSigns.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -374,7 +374,7 @@


                log.info("用户标签"+appUserTags.size());




                appUserTags = appUserTags.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -387,7 +387,7 @@


                log.info("用户会员明细"+appUserVipDetails.size());




                appUserVipDetails = appUserVipDetails.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -399,7 +399,7 @@


            if (!inviteUsers.isEmpty()) {


                log.info("邀请用户"+inviteUsers.size());


                inviteUsers = inviteUsers.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -411,7 +411,7 @@


            if (!invoiceInformations.isEmpty()) {


                log.info("开票"+invoiceInformations.size());


                invoiceInformations = invoiceInformations.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -448,7 +448,7 @@


                log.info("策略"+accountingStrategies.size());


                // 筛选出昨天凌晨00:00:00到昨天晚上23:59:59的数据


                accountingStrategies = accountingStrategies.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -460,7 +460,7 @@


            if (!accountingStrategyDetails.isEmpty()) {


                log.info("策略明细"+accountingStrategyDetails.size());


                accountingStrategyDetails = accountingStrategyDetails.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -471,7 +471,7 @@


            if (!applyChargingPiles.isEmpty()) {


                log.info("申请充电桩"+applyChargingPiles.size());


                applyChargingPiles = applyChargingPiles.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -485,7 +485,7 @@


                log.info("车库"+carports.size());


                // 分批插入数据 每次最多700条


                carports = carports.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -497,7 +497,7 @@


                log.info("充电枪"+chargingGuns.size());


                // 分批插入数据 每次最多700条


                chargingGuns = chargingGuns.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -511,7 +511,7 @@


                log.info("充电桩"+chargingPiles.size());


                // 分批插入数据 每次最多700条


                chargingPiles = chargingPiles.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -524,7 +524,7 @@


                log.info("充电桩通知"+chargingPileNotifications.size());


                // 分批插入数据 每次最多700条


                chargingPileNotifications = chargingPileNotifications.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -536,7 +536,7 @@


                log.info("故障"+faultMessages.size());


                // 分批插入数据 每次最多700条


                faultMessages = faultMessages.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -548,7 +548,7 @@


                log.info("监控设备"+monitoringEquipments.size());


                // 分批插入数据 每次最多700条


                monitoringEquipments = monitoringEquipments.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -561,7 +561,7 @@


                log.info("停车场"+parkingLots.size());


                // 分批插入数据 每次最多700条


                parkingLots = parkingLots.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -573,7 +573,7 @@


                log.info("停车记录"+parkingRecords.size());


                // 分批插入数据 每次最多700条


                parkingRecords = parkingRecords.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -594,7 +594,7 @@


                log.info("报修"+repairs.size());


                // 分批插入数据 每次最多700条


                repairs = repairs.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -606,7 +606,7 @@


                log.info("站点菜单"+repairs.size());


                // 分批插入数据 每次最多700条


                siteMenus = siteMenus.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -618,7 +618,7 @@


                log.info("车道"+vehicleRamps.size());


                // 分批插入数据 每次最多700条


                vehicleRamps = vehicleRamps.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -653,7 +653,7 @@


                log.info("订单明细策略" + accountingStrategyDetailOrders.size());


                // 分批插入数据 每次最多700条


                accountingStrategyDetailOrders = accountingStrategyDetailOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -668,7 +668,7 @@


                // 分批插入数据 每次最多700条


                int size = 700;


                accountingStrategyOrders = accountingStrategyOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -684,7 +684,7 @@


                // 分批插入数据 每次最多700条


                // 分批插入数据 每次最多700条


                chargingBills = chargingBills.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -699,7 +699,7 @@


                log.info("充电订单策略" + chargingOrderAccountingStrategies.size());


                // 分批插入数据 每次最多700条


                chargingOrderAccountingStrategies = chargingOrderAccountingStrategies.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -714,7 +714,7 @@




                // 分批插入数据 每次最多700条


                chargingOrderRefunds = chargingOrderRefunds.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -728,7 +728,7 @@


                log.info("充电订单" + chargingOrders.size());


                // 分批插入数据 每次最多700条


                chargingOrders = chargingOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -743,7 +743,7 @@


            if (!exchangeOrders.isEmpty()) {


                log.info("兑换订单" + exchangeOrders.size());


                exchangeOrders = exchangeOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -759,7 +759,7 @@




                // 分批插入数据 每次最多700条


                grantVips = grantVips.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -772,7 +772,7 @@


            if (!orderAppeals.isEmpty()) {


                log.info("订单申诉" + orderAppeals.size());


                orderAppeals = orderAppeals.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -786,7 +786,7 @@


            if (!orderEvaluates.isEmpty()) {


                log.info("订单评价"+orderEvaluates.size());


                orderEvaluates = orderEvaluates.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -801,7 +801,7 @@


                log.info("订单评价标签" + orderEvaluateTags.size());


                // 分批插入数据 每次最多700条


                orderEvaluateTags = orderEvaluateTags.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -815,7 +815,7 @@


                log.info("订单开票明细" + orderInvoiceDetails.size());


                // 分批插入数据 每次最多700条


                orderInvoiceDetails = orderInvoiceDetails.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -828,7 +828,7 @@


            if (!orderInvoices.isEmpty()) {


                log.info("订单开票" + orderInvoices.size());


                orderInvoices = orderInvoices.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -843,7 +843,7 @@


            if (!settlementConfirms.isEmpty()) {


                log.info("账单结算" + settlementConfirms.size());


                settlementConfirms = settlementConfirms.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -858,7 +858,7 @@


                log.info("购物订单退款" + shoppingOrderRefunds.size());


                // 分批插入数据 每次最多700条


                shoppingOrderRefunds = shoppingOrderRefunds.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .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) {


@@ -871,7 +871,7 @@


            if (!vipOrderRefunds.isEmpty()) {


                log.info("会员订单退款" + vipOrderRefunds);


                vipOrderRefunds = vipOrderRefunds.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -885,7 +885,7 @@


            if (!vipOrders.isEmpty()) {


                log.info("会员订单" + vipOrders.size());


                vipOrders = vipOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -899,7 +899,7 @@


            if (!shoppingOrders.isEmpty()) {


                log.info("购物订单" + shoppingOrders.size());


                shoppingOrders = shoppingOrders.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条


@@ -1038,7 +1038,7 @@


            if (!loginLogs.isEmpty()) {


                log.info("登录日志"+loginLogs.size());


                loginLogs = loginLogs.stream()


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))


                        .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))


                        .collect(Collectors.toList());


                // 分批插入数据 每次最多700条




 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java


New file


@@ -0,0 +1,75 @@


package com.ruoyi.order.controller;






import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.web.domain.BasePojo;


import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;


import com.ruoyi.order.api.model.TChargingOrder;


import com.ruoyi.order.service.TChargingOrderService;


import com.ruoyi.order.vo.LargeChargingPowerVo;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.SneakyThrows;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import java.util.stream.Collectors;




@Api(tags = "大屏")


@RestController


@RequestMapping("/large-screen")


public class LargeScreenController {




    private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");




    @Resource


    private TChargingOrderService chargingOrderService;






    @SneakyThrows


    @ApiOperation(tags = {"大屏-停车场充电功率曲线图"},value = "停车场充电功率曲线图")


    @GetMapping("/getChargingPower")


    public R<List<LargeChargingPowerVo>> getChargingPower(){


        String sevenDayAgo = LocalDate.now().minusDays(7) + " 00:00:00";


        String oneDayAgo = LocalDate.now().minusDays(1) + " 23:59:59";


        Date oneDayAgoTime = format.parse(oneDayAgo);


        Date sevenDayAgoTime = format.parse(sevenDayAgo);


        ArrayList<LargeChargingPowerVo> largeChargingPowerVos = new ArrayList<>();


        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");


        List<TChargingOrder> list1 = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().between(BasePojo::getCreateTime, sevenDayAgoTime, oneDayAgoTime).eq(BasePojo::getDelFlag, 0));




        for (int count = 7; count > 0; count--) {


            LargeChargingPowerVo largeChargingPowerVo = new LargeChargingPowerVo();


            String time = LocalDate.now().minusDays(count).toString();




            List<TChargingOrder> list = list1.stream().filter(e ->e.getCreateTime().toString().contains(time)).collect(Collectors.toList());


            if(!list.isEmpty()){


                System.out.println(list);


                list.stream().forEach(e -> {


                    if(e.getChargingPower()==null){


                        e.setChargingPower(BigDecimal.ZERO);


                    }


                });


                BigDecimal powerAverage = list.stream().map(TChargingOrder::getChargingPower).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(list.size()), 0, RoundingMode.HALF_UP);


                largeChargingPowerVo.setPower(powerAverage);


            }


            largeChargingPowerVo.setTime(time);


            largeChargingPowerVos.add(largeChargingPowerVo);


        }




        return R.ok(largeChargingPowerVos);


    }








}