From 6f91919a81c92766cb6a119dfe099b83a22ef446 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 15 八月 2024 11:59:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
index b348dd8..c8ce17b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
@@ -6,6 +6,7 @@
 import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
 import com.ruoyi.chargingPile.api.query.PageChargingPileList;
 import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
+import com.ruoyi.chargingPile.dto.ChargeMonitoring;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageInfo;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -73,8 +74,17 @@
 	/**
 	 * 获取站点下充电桩及充电枪列表
 	 * @param siteId
+	 * @param type
 	 * @return
 	 */
-	List<TChargingPileVO> getChargingGunList(Integer siteId);
+	List<TChargingPileVO> getChargingGunList(Integer siteId,Integer type);
+	
+	
+	/**
+	 * 获取充电设备监控数据
+	 * @param siteId
+	 * @return
+	 */
+	ChargeMonitoring chargeMonitoring(Integer siteId);
 
 }

--
Gitblit v1.7.1