From 8a038cf6f0792cfe260a94e86d954b50f068e758 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 16:55:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 f00eeee..5286e01 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
@@ -26,6 +26,7 @@
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.order.api.feignClient.ChargingOrderClient;
import io.swagger.annotations.Api;
@@ -67,6 +68,22 @@
@Autowired
private FileUploadConfig fileUploadConfig;
+
+
+ /**
+ * 查询所有枪
+ */
+ @PostMapping(value = "/getAllGun")
+ public R<List<TChargingGun>> getAllGun() {
+ return R.ok(chargingGunService.list(null));
+ }
+ /**
+ * 查询所有桩
+ */
+ @PostMapping(value = "/getAllPile")
+ public R<List<TChargingPile>> getAllPile() {
+ return R.ok(chargingPileService.list(null));
+ }
/**
* 查询充电枪列表
@@ -200,7 +217,8 @@
e.printStackTrace();
}
}
-
+ @Resource
+ private TokenService tokenService;
/**
* 设备状态统计
*/
@@ -209,7 +227,7 @@
@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()) {
--
Gitblit v1.7.1