From 3223c6424a4a067591103809ccfed0452b5cb227 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 11:21:26 +0800
Subject: [PATCH] 代码合并
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 8be1229..b876d46 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
@@ -80,11 +80,10 @@
}
-
@ResponseBody
@GetMapping("/pageChargingPileList")
@ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
- public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(@RequestBody PageChargingPileList page){
+ public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(PageChargingPileList page){
PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
return AjaxResult.success(list);
}
@@ -118,13 +117,13 @@
@ResponseBody
- @DeleteMapping("/delChargingPile/{id}")
+ @DeleteMapping("/delChargingPile")
@Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"})
@ApiImplicitParams({
@ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delChargingPile(@PathVariable Integer[] id){
+ public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
return chargingPileService.delChargingPile(id);
}
@@ -163,5 +162,18 @@
PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
return AjaxResult.success(chargingGunMonitoring);
}
+
+
+ /**
+ * 根据id获取充电桩信息
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getChargingPileById/{id}")
+ public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
+ TChargingPile chargingPile = chargingPileService.getById(id);
+ return R.ok(chargingPile);
+ }
}
--
Gitblit v1.7.1