From 2f226b5b2d80be1eba34d3c641b7cc08be0c322c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 6bb855e..60ecce0 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -38,7 +39,7 @@
/**
* 查询充电枪列表
*/
- @ApiOperation(tags = {"后台-充电枪"},value = "查询充电枪分页列表")
+ @ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查询充电枪分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TChargingGunVO>> pageList(@RequestBody TChargingGunQuery query) {
return AjaxResult.ok(chargingGunService.pageList(query));
@@ -47,25 +48,25 @@
/**
* 添加充电枪管理
*/
- @ApiOperation(tags = {"后台-充电枪"},value = "添加充电枪")
+ @ApiOperation(tags = {"管理后台-充电桩信息"},value = "添加充电枪")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TChargingGunDTO dto) {
- return AjaxResult.ok(chargingGunService.save(dto));
+ public AjaxResult add(@RequestBody TChargingGunDTO dto) {
+ return chargingGunService.add(dto);
}
/**
* 修改充电枪
*/
- @ApiOperation(tags = {"后台-充电枪"},value = "修改充电枪")
+ @ApiOperation(tags = {"管理后台-充电桩信息"},value = "修改充电枪")
@PostMapping(value = "/update")
- public AjaxResult<Boolean> update(@RequestBody TChargingGunDTO dto) {
- return AjaxResult.ok(chargingGunService.updateById(dto));
+ public AjaxResult update(@RequestBody TChargingGunDTO dto) {
+ return chargingGunService.update(dto);
}
/**
* 查看充电枪详情
*/
- @ApiOperation(tags = {"后台-充电枪"},value = "查看充电枪详情")
+ @ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查看充电枪详情")
@GetMapping(value = "/getDetailById")
public AjaxResult<TChargingGun> getDetailById(@RequestParam Integer id) {
return AjaxResult.ok(chargingGunService.getById(id));
@@ -74,10 +75,13 @@
/**
* 删除充电枪
*/
- @ApiOperation(tags = {"后台-充电枪"},value = "删除充电枪")
+ @ApiOperation(tags = {"管理后台-充电桩信息"},value = "删除充电枪")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
- return AjaxResult.ok(chargingGunService.removeById(id));
+ TChargingGun chargingGun = chargingGunService.getById(id);
+ chargingGun.setDelFlag(true);
+ chargingGunService.updateById(chargingGun);
+ return AjaxResult.success();
}
/**
@@ -99,5 +103,12 @@
return AjaxResult.success();
}
+
+
+ @ApiOperation(tags = {"管理后台-充电桩信息"},value = "下载二维码")
+ @GetMapping(value = "/downloadQRCode/{id}")
+ public void downloadQRCode(@PathVariable Integer id, HttpServletResponse response){
+ // todo 待完善
+ }
}
--
Gitblit v1.7.1