From fb9e286342938f63af535eb2a363f783a63213db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 28 五月 2025 11:13:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 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 4ac3c29..24e454b 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
@@ -9,10 +9,7 @@
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.GetChargingGunByCode;
-import com.ruoyi.chargingPile.api.vo.GunStatusStatisticsVO;
-import com.ruoyi.chargingPile.api.vo.SiteNameVO;
-import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
+import com.ruoyi.chargingPile.api.vo.*;
import com.ruoyi.chargingPile.config.FileUploadConfig;
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
@@ -42,6 +39,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -348,5 +346,54 @@
TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).eq(TChargingGun::getFullNumber, fullNumber));
return R.ok(chargingGun);
}
+
+
+
+
+
+ /**
+ * 根据枪唯一码查询信息
+ * @return
+ */
+ @ApiOperation(tags = {"大屏-对外开放区车位使用情况"},value = "对外开放区车位使用情况")
+ @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));
+ if(tChargingGuns.isEmpty()){
+ return R.ok(largeScreenGunVo);
+ }
+ List<TChargingGun> supperFast = tChargingGuns.stream().filter(e -> e.getChargeMode() == 1).collect(Collectors.toList());
+ largeScreenGunVo.setSuperFast(supperFast.size());
+ int supperFastSize = supperFast.stream().filter(e -> e.getStatus() != 2).collect(Collectors.toList()).size();
+ largeScreenGunVo.setUseSuperFast(supperFastSize);
+ List<TChargingGun> fast = tChargingGuns.stream().filter(e -> e.getChargeMode() == 2).collect(Collectors.toList());
+ largeScreenGunVo.setFast(fast.size());
+ int fastSize = fast.stream().filter(e -> e.getStatus() != 2).collect(Collectors.toList()).size();
+ largeScreenGunVo.setUseFast(fastSize);
+ List<TChargingGun> v2g = tChargingGuns.stream().filter(e -> e.getChargeMode() == 4).collect(Collectors.toList());
+ largeScreenGunVo.setV2g(v2g.size());
+ int v2gSize = v2g.stream().filter(e -> e.getStatus() != 2).collect(Collectors.toList()).size();
+ largeScreenGunVo.setUseV2g(v2gSize);
+
+ return R.ok(largeScreenGunVo);
+ }
+
+
+
+
+
+
+ /**
+ * 大屏 根据站点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