From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 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 1c1442d..4ac3c29 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
@@ -1,8 +1,6 @@
package com.ruoyi.chargingPile.controller;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
@@ -10,7 +8,6 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
import com.ruoyi.chargingPile.api.vo.GunStatusStatisticsVO;
@@ -23,14 +20,14 @@
import com.ruoyi.chargingPile.util.QRCodeUtils;
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;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.IntegrationClient;
-import com.ruoyi.integration.api.model.EndCharge;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,13 +37,11 @@
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -74,9 +69,26 @@
@Autowired
private FileUploadConfig fileUploadConfig;
+
+ /**
+ * 查询所有枪
+ */
+ @PostMapping(value = "/getAllGun")
+ public R<List<TChargingGun>> getAllGun() {
+ return R.ok(chargingGunService.list());
+ }
+ /**
+ * 查询所有桩
+ */
+ @PostMapping(value = "/getAllPile")
+ public R<List<TChargingPile>> getAllPile() {
+ return R.ok(chargingPileService.list());
+ }
+
/**
* 查询充电枪列表
*/
+ @RequiresPermissions(value = {"/chargingPile", "/chargingGun"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查询充电枪分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TChargingGunVO>> pageList(@RequestBody TChargingGunQuery query) {
@@ -86,6 +98,7 @@
/**
* 添加充电枪管理
*/
+ @RequiresPermissions(value = {"/chargingPile/add_charging_gun"}, logical = Logical.OR)
@Log(title = "【充电桩信息】添加充电枪", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "添加充电枪")
@PostMapping(value = "/add")
@@ -96,6 +109,7 @@
/**
* 修改充电枪
*/
+ @RequiresPermissions(value = {"/chargingGun/update"}, logical = Logical.OR)
@Log(title = "【充电桩信息】修改充电枪", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "修改充电枪")
@PostMapping(value = "/update")
@@ -106,6 +120,7 @@
/**
* 查看充电枪详情
*/
+ @RequiresPermissions(value = {"/chargingGun/update", "/chargingGun/select"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-充电枪", "管理后台-充电桩信息"},value = "查看充电枪详情")
@GetMapping(value = "/getDetailById")
public AjaxResult<TChargingGun> getDetailById(@RequestParam("id") Integer id) {
@@ -115,6 +130,7 @@
/**
* 删除充电枪
*/
+ @RequiresPermissions(value = {"/chargingGun/del"}, logical = Logical.OR)
@Log(title = "【充电桩信息】删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "删除充电枪")
@DeleteMapping(value = "/deleteById")
@@ -127,6 +143,7 @@
/**
* 批量删除充电枪
*/
+ @RequiresPermissions(value = {"/chargingGun/del"}, logical = Logical.OR)
@Log(title = "【充电桩信息】批量删除充电枪", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-充电枪"},value = "批量删除充电枪")
@DeleteMapping(value = "/deleteByIds")
@@ -138,6 +155,7 @@
/**
* 结束充电
*/
+ @RequiresPermissions(value = {"/chargingGun/end_charging"}, logical = Logical.OR)
@Log(title = "【充电桩信息】结束充电", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-充电枪"},value = "结束充电")
@PutMapping(value = "/stopCharging")
@@ -151,6 +169,7 @@
+ @RequiresPermissions(value = {"/chargingGun/download_qr_code"}, logical = Logical.OR)
@ApiOperation(tags = {"管理后台-充电桩信息"},value = "下载二维码")
@GetMapping(value = "/downloadQRCode/{id}")
@Log(title = "【充电桩信息】下载二维码", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
@@ -198,15 +217,17 @@
e.printStackTrace();
}
}
-
+ @Resource
+ private TokenService tokenService;
/**
* 设备状态统计
*/
+ @RequiresPermissions(value = {"/workbench"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-工作台"},value = "设备状态统计")
@PutMapping(value = "/gunStatusStatistics")
public R<GunStatusStatisticsVO> gunStatusStatistics() {
List<Integer> siteIds = new ArrayList<>();
- Long userId = SecurityUtils.getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
//获取当前登录的siteIds
PageInfo<GetSiteListDTO> siteList1 = siteService.getSiteList1(userId);
for (GetSiteListDTO datum : siteList1.getRecords()) {
@@ -289,5 +310,43 @@
chargingGunService.updateById(chargingGun);
return R.ok();
}
+
+
+
+ /**
+ * 根据充电桩id获取枪
+ * @param chargingPileId
+ * @return
+ */
+ @PostMapping("/getChargingGunByChargingPileId")
+ public R<List<TChargingGun>> getChargingGunByChargingPileId(@RequestParam("chargingPileId") Integer chargingPileId){
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPileId)
+ .eq(TChargingGun::getDelFlag, 0));
+ return R.ok(list);
+ }
+
+
+ /**
+ * 根据充电桩ids获取枪
+ * @param chargingPileIds
+ * @return
+ */
+ @PostMapping("/getChargingGunByChargingPileIds")
+ public R<List<TChargingGun>> getChargingGunByChargingPileIds(@RequestParam("chargingPileIds") List<Integer> chargingPileIds){
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, chargingPileIds)
+ .eq(TChargingGun::getDelFlag, 0));
+ return R.ok(list);
+ }
+
+
+ /**
+ * 根据枪唯一码查询信息
+ * @return
+ */
+ @PostMapping("/getChargingGunByFullNumber")
+ public R<TChargingGun> getChargingGunByFullNumber(@RequestParam("fullNumber") String fullNumber){
+ TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).eq(TChargingGun::getFullNumber, fullNumber));
+ return R.ok(chargingGun);
+ }
}
--
Gitblit v1.7.1