From 146cffe8e1a2223677dadf2b51e6fd4fd08e5810 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 24 八月 2024 17:29:27 +0800
Subject: [PATCH] 计费修改

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java |   52 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 8 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 f65d459..334d16f 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
@@ -3,10 +3,14 @@
 
 import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
 import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
 import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
 import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
 import com.ruoyi.chargingPile.service.TChargingGunService;
+import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.domain.BaseDelete;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
@@ -16,7 +20,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -33,6 +39,9 @@
 public class TChargingGunController {
 
     private final TChargingGunService chargingGunService;
+    
+    @Resource
+    private TChargingPileService chargingPileService;
 
     @Autowired
     public TChargingGunController(TChargingGunService chargingGunService) {
@@ -73,7 +82,7 @@
      */
     @ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查看充电枪详情")
     @GetMapping(value = "/getDetailById")
-    public AjaxResult<TChargingGun> getDetailById(@RequestParam Integer id) {
+    public AjaxResult<TChargingGun> getDetailById(@RequestParam("id") Integer id) {
         return AjaxResult.ok(chargingGunService.getById(id));
     }
 
@@ -83,10 +92,9 @@
     @Log(title = "删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
     @ApiOperation(tags = {"管理后台-充电桩信息"},value = "删除充电枪")
     @DeleteMapping(value = "/deleteById")
-    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+    public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
         TChargingGun chargingGun = chargingGunService.getById(id);
-        chargingGun.setDelFlag(true);
-        chargingGunService.updateById(chargingGun);
+        chargingGunService.removeById(chargingGun);
         return AjaxResult.success();
     }
 
@@ -96,8 +104,9 @@
     @Log(title = "批量删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
     @ApiOperation(tags = {"后台-充电枪"},value = "批量删除充电枪")
     @DeleteMapping(value = "/deleteByIds")
-    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
-        return AjaxResult.ok(chargingGunService.removeByIds(ids));
+    public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+        String[] split = ids.split(",");
+        return AjaxResult.ok(chargingGunService.removeByIds(Arrays.asList(split)));
     }
 
     /**
@@ -105,8 +114,8 @@
      */
     @Log(title = "结束充电", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
     @ApiOperation(tags = {"后台-充电枪"},value = "结束充电")
-    @PostMapping(value = "/stopCharging")
-    public AjaxResult<String> stopCharging() {
+    @PutMapping(value = "/stopCharging")
+    public AjaxResult<String> stopCharging(@RequestParam("id") Integer id) {
         // TODO 硬件 结束充电
         return AjaxResult.success();
     }
@@ -118,5 +127,32 @@
     public void downloadQRCode(@PathVariable Integer id, HttpServletResponse response){
         // todo 待完善
     }
+    
+    
+    /**
+     * 根据id获取充电枪完整名称
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @PostMapping(value = "/getAllName/{id}")
+    public R<String> getAllName(@PathVariable Integer id){
+        TChargingGun chargingGun = chargingGunService.getById(id);
+        TChargingPile chargingPile = chargingPileService.getById(chargingGun.getChargingPileId());
+        return R.ok(chargingPile.getName() + chargingGun.getName());
+    }
+    
+    
+    /**
+     * 根据id获取充电枪详情
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @PostMapping(value = "/getChargingGunById/{id}")
+    public R<TChargingGun> getChargingGunById(@PathVariable Integer id){
+        TChargingGun chargingGun = chargingGunService.getById(id);
+        return R.ok(chargingGun);
+    }
 }
 

--
Gitblit v1.7.1