From 3e1fc145ecefd1d823423b2e31366a0c1c9a723c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 16 八月 2024 15:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index fa10d0f..8be1229 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -6,6 +6,9 @@
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
@@ -136,11 +139,29 @@
}
-
+ @ResponseBody
@GetMapping("/chargeMonitoring/{siteId}")
- @ApiOperation(value = "修改备注", tags = {"管理后台-充电设备监控"})
+ @ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
public AjaxResult<ChargeMonitoring> chargeMonitoring(@PathVariable Integer siteId){
+ ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
+ return AjaxResult.success(chargeMonitoring);
+ }
+ @ResponseBody
+ @GetMapping("/getChargingGunCountMonitoring/{siteId}")
+ @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
+ public AjaxResult<ChargingGunCountMonitoring> getChargingGunCountMonitoring(@PathVariable Integer siteId){
+ ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
+ return AjaxResult.success(chargingGunCountMonitoring);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getChargingGunMonitoring")
+ @ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
+ public AjaxResult<PageInfo<ChargingGunMonitoring>> getChargingGunMonitoring(GetChargingGunMonitoring query){
+ PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
+ return AjaxResult.success(chargingGunMonitoring);
}
}
--
Gitblit v1.7.1