From 99eddbebf80c5549a7487caed95b041abdc9bb5f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 14:06:40 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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..cc3f860 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
@@ -359,7 +359,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 +383,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