From 3c99ce947f25a2dcbae14e78276df77978d412ca Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 0857bc3..787cdbb 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
@@ -65,7 +65,7 @@
* 查询充电桩列表
*/
@ApiOperation(tags = {"小程序-充电桩"},value = "通过站点id查询充电桩列表")
- @PostMapping(value = "/list")
+ @GetMapping(value = "/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "siteId", value = "站点id")
})
@@ -94,7 +94,12 @@
return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
.eq(TChargingPile::getSiteId,siteId)));
}
-
+
+ @PostMapping(value = "/getChargingPileBySiteIds")
+ public R<List<TChargingPile>> getChargingPileBySiteIds(@RequestParam("siteIds") List<Integer> siteIds) {
+ return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
+ .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
+ }
@ResponseBody
@GetMapping("/pageChargingPileList")
@@ -105,7 +110,7 @@
}
@ResponseBody
- @Log(title = "添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@ApiOperation(value = "添加充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
@@ -123,7 +128,7 @@
@ResponseBody
- @Log(title = "编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@ApiOperation(value = "编辑充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
@@ -134,7 +139,7 @@
@ResponseBody
@DeleteMapping("/delChargingPile")
- @Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"})
@ApiImplicitParams({
@ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true)
@@ -145,7 +150,7 @@
@ResponseBody
- @Log(title = "批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@ApiOperation(value = "批量设置计费策略", tags = {"管理后台-充电桩信息"})
public AjaxResult batchSetAccountingStrategy(@RequestBody BatchSetAccountingStrategy setAccountingStrategy){
@@ -161,7 +166,8 @@
ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
return AjaxResult.success(chargeMonitoring);
}
-
+
+
@ResponseBody
@GetMapping("/getChargingGunCountMonitoring/{siteId}")
@ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
--
Gitblit v1.7.1