From 9bc378e6bb9b4563a0dec222e1c2d5d3278632cb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 17 九月 2025 17:41:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 3a26eff..9b93c6e 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
@@ -326,12 +326,14 @@
/**
* 根据充电桩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)
+ public R<List<TChargingGun>> getChargingGunByChargingPileIds(@RequestBody GetChargingGunByChargingPileIdsVo vo){
+ if(vo.getChargingPileIds().isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, vo.getChargingPileIds())
.eq(TChargingGun::getDelFlag, 0));
return R.ok(list);
}
@@ -359,7 +361,7 @@
@GetMapping("/getLargeScreenGun")
public R<LargeScreenGunVo> getLargeScreenGun(){
LargeScreenGunVo largeScreenGunVo = new LargeScreenGunVo();
- List<TChargingGun> tChargingGuns = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).in(TChargingGun::getSiteId,25,26).in(TChargingGun::getChargeMode, 1,2,4));
+ List<TChargingGun> tChargingGuns = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).in(TChargingGun::getSiteId,26).in(TChargingGun::getChargeMode, 1,2,4));
if(tChargingGuns.isEmpty()){
return R.ok(largeScreenGunVo);
}
@@ -383,5 +385,17 @@
+
+ /**
+ * 大屏 根据站点ids和充电模式集合查询充电枪集合 没有过滤del_flag
+ */
+ @GetMapping("/getGunIdsBySiteIdsAndChargeModels")
+ public R<List<Integer>> getGunIdsBySiteIdsAndChargeModels(@RequestParam("siteIds") List<Integer> siteIds ,@RequestParam("chargeModels") List<Integer> chargeModels){
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>()
+ .select(TChargingGun::getId).in(TChargingGun::getSiteId, siteIds)
+ .in(TChargingGun::getChargeMode, chargeModels));
+ return R.ok(list.stream().map(TChargingGun::getId).collect(Collectors.toList()));
+ }
+
}
--
Gitblit v1.7.1