From ae84ae528290f44c66ef14c92f4a68bd3c1ce617 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 十一月 2024 08:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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