From e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 04 十一月 2024 15:39:01 +0800 Subject: [PATCH] merge --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java index dcea1b1..2666ac1 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java @@ -306,8 +306,36 @@ StatusModeStatisticsVO statusModeStatistics1 = this.baseMapper.getStatusModeStatistics(siteIds,1); StatusModeStatisticsVO statusModeStatistics2 = this.baseMapper.getStatusModeStatistics(siteIds,2); StatusModeStatisticsVO statusModeStatistics3 = this.baseMapper.getStatusModeStatistics(siteIds,3); + if (statusModeStatistics1==null){ + StatusModeStatisticsVO vo = new StatusModeStatisticsVO(); + vo.setChargeMode(1); + vo.setFreeCount(0); + vo.setFilledCount(0); + vo.setInsertCount(0); + vo.setChargingCount(0); + statusModeStatistics1 =vo; + } statusModeStatisticsVOS.add(statusModeStatistics1); + if (statusModeStatistics2==null){ + StatusModeStatisticsVO vo = new StatusModeStatisticsVO(); + vo.setChargeMode(2); + vo.setFreeCount(0); + vo.setFilledCount(0); + vo.setInsertCount(0); + vo.setChargingCount(0); + statusModeStatistics2 =vo; + } statusModeStatisticsVOS.add(statusModeStatistics2); + + if (statusModeStatistics3==null){ + StatusModeStatisticsVO vo = new StatusModeStatisticsVO(); + vo.setChargeMode(3); + vo.setFreeCount(0); + vo.setFilledCount(0); + vo.setInsertCount(0); + vo.setChargingCount(0); + statusModeStatistics3 =vo; + } statusModeStatisticsVOS.add(statusModeStatistics3); gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatisticsVOS); return gunStatusStatisticsVO; -- Gitblit v1.7.1