From ba0f5c3079fedcea55e3d375f319743e5daa239e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 七月 2026 14:37:34 +0800
Subject: [PATCH] 修改地图站点查询bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 209 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 133 insertions(+), 76 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index ae4c353..5827bf4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -26,11 +26,13 @@
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
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;
@@ -111,7 +113,15 @@
private AppUserClient appUserClient;
@Resource
private AppUserVipDetailClient vipDetailClient;
-
+ // 远程新增临时站点
+ @ResponseBody
+ @PostMapping("/addSiteTemp")
+ @ApiOperation(value = "添加站点", tags = {"管理后台-站点管理"})
+ @Log(title = "【站点管理】添加站点", businessType = BusinessType.INSERT)
+ public R addSiteTemp(@RequestBody Site site){
+ siteService.save(site);
+ return R.ok(site.getId());
+ }
/**
* 根据站点id 查询所有充电桩
* @param siteId
@@ -127,14 +137,19 @@
* @param number
* @return
*/
+ @Log(title = "【扫一扫】通过桩编号获取电站信息", businessType = BusinessType.OTHER,operatorType = OperatorType.MOBILE)
@GetMapping("/getSiteInfoByNumber")
@ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
SiteInfoVO siteInfoVO = new SiteInfoVO();
TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, number));
+ Site site = siteService.getById(chargingGun.getSiteId());
+ Integer accountingStrategyId = chargingGun.getAccountingStrategyId();
+ if(null == accountingStrategyId){
+ accountingStrategyId = site.getAccountingStrategyId();
+ }
TChargingPile one = chargingPileService.getById(chargingGun.getChargingPileId());
- Site byId = siteService.getById(chargingGun.getSiteId());
- TAccountingStrategy byId1 = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
+ TAccountingStrategy byId1 = accountingStrategyService.getById(accountingStrategyId);
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
@@ -143,36 +158,41 @@
&& DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
- if(Objects.nonNull(byId1.getDiscount())){
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
- }else {
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
- }
- if(Objects.nonNull(appUser)){
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ if(StringUtils.isNotEmpty(token)){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ TAppUser appUser = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(byId1.getDiscount())){
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }else {
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }
+ TVip vip = null;
+ if(Objects.nonNull(appUser)){
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
- getAppUserVipDetail.setAppUserId(userId);
- getAppUserVipDetail.setVipId(appUser.getVipId());
- R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
- if(Objects.nonNull(data1)){
- String vipJson = data1.getVipJson();
- TVip vip = JSON.parseObject(vipJson, TVip.class);
- if(Objects.nonNull(vip) && vip.getType() == 2){
- siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+ if(Objects.nonNull(data1)){
+ String vipJson = data1.getVipJson();
+ vip = JSON.parseObject(vipJson, TVip.class);
}
+ }
+
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
}
}
}
}
siteInfoVO.setChargingGunId(chargingGun.getId());
siteInfoVO.setChargingPileId(one.getId());
- siteInfoVO.setName(byId.getName());
+ siteInfoVO.setName(site.getName());
siteInfoVO.setNumber(one.getNumber().toString());
- siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ siteInfoVO.setSpaceChargeExplain(site.getSpaceChargeExplain());
return R.ok(siteInfoVO);
}
/**
@@ -184,8 +204,13 @@
public R<SiteInfoVO> getSiteInfoByNumber1(@RequestParam("number") String number){
SiteInfoVO siteInfoVO = new SiteInfoVO();
TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getCode, number).one();
- Site byId = siteService.getById(one.getSiteId());
- TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
+ TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, one.getId()).last(" limit 0, 1"));
+ Site site = siteService.getById(chargingGun.getSiteId());
+ Integer accountingStrategyId = chargingGun.getAccountingStrategyId();
+ if(null == accountingStrategyId){
+ accountingStrategyId = site.getAccountingStrategyId();
+ }
+ TAccountingStrategy byId1 = accountingStrategyService.getById(accountingStrategyId);
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
@@ -194,29 +219,34 @@
&& DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ if(StringUtils.isNotEmpty(token)){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ TAppUser appUser = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(appUser)){
+// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+ if(Objects.nonNull(data1)){
+ String vipJson = data1.getVipJson();
+ TVip vip = JSON.parseObject(vipJson, TVip.class);
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
+ }
+ }
+ }
+ }
+
if(Objects.nonNull(byId1.getDiscount())){
siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}else {
siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}
- if(Objects.nonNull(appUser)){
-// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
- getAppUserVipDetail.setAppUserId(userId);
- getAppUserVipDetail.setVipId(appUser.getVipId());
- R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
- if(Objects.nonNull(data1)){
- String vipJson = data1.getVipJson();
- TVip vip = JSON.parseObject(vipJson, TVip.class);
- if(Objects.nonNull(vip) && vip.getType() == 2){
- siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }
- }
- }
+
}
}
List<TVip> vips = vipClient.getVipList().getData();
@@ -232,9 +262,9 @@
siteInfoVO.setCouponCount(num);
}
siteInfoVO.setChargingPileId(one.getId());
- siteInfoVO.setName(byId.getName());
+ siteInfoVO.setName(site.getName());
siteInfoVO.setNumber(one.getNumber().toString());
- siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ siteInfoVO.setSpaceChargeExplain(site.getSpaceChargeExplain());
return R.ok(siteInfoVO);
}
@@ -266,43 +296,50 @@
siteList.setPageCurr(1);
siteList.setPageSize(99999);
PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
- for (GetSiteListDTO record : list.getRecords()) {
+ List<GetSiteListDTO> records = list.getRecords();
+ if(records.isEmpty()){
+ return R.ok(Collections.emptyList());
+ }
+ List<Integer> collect = records.stream().map(GetSiteListDTO::getId).collect(Collectors.toList());
+ List<TChargingGun> tChargingGuns = chargingGunService.lambdaQuery().in(TChargingGun::getSiteId, collect).list();
+ List<TChargingPile> tChargingPiles = chargingPileService.lambdaQuery().in(TChargingPile::getSiteId, collect).list();
+ Map<Integer, BigDecimal> map = chargingOrderClient.getSiteChargingCapacity(collect).getData();
+ if(null == map){
+ return R.ok(Collections.emptyList());
+ }
+ for (GetSiteListDTO record : list.getRecords()) {
List<Integer> c1 = new ArrayList<>();
c1.add(3);
c1.add(4);
c1.add(5);
c1.add(6);
- Long count = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, 2).count();
+ Long count = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 1 && s.getStatus() == 2).count();
record.setC1(count);
- Long count1 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 1).count();
+ Long count1 = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 1).count();
record.setC2(count1);
- Long count2 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, 2).count();
+ Long count2 = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 2 && s.getStatus() == 2).count();
record.setK1(count2);
- Long count3 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 2).count();
+ Long count3 = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 2).count();
record.setK2(count3);
- Long count4 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, 2).count();
+ Long count4 = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 3 && s.getStatus() == 2).count();
record.setM1(count4);
- Long count5 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 3).count();
+ Long count5 = tChargingGuns.stream().filter(s->s.getSiteId().equals(record.getId()) && s.getChargeMode() == 3).count();
record.setM2(count5);
//利用率
- BigDecimal bigDecimal = new BigDecimal("0");
- //获取该站点的总充电度数
- List<TChargingOrder> chargingOrders = chargingOrderClient.getList(record.getId()).getData();
- for (TChargingOrder chargingOrder : chargingOrders) {
- bigDecimal = bigDecimal.add(chargingOrder.getChargingCapacity());
- }
+ BigDecimal bigDecimal = map.get(record.getId());
+ if(null == bigDecimal){
+ bigDecimal = BigDecimal.ZERO;
+ }
//获取该站点的所有充电桩
- List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, record.getId()).list();
- BigDecimal bigDecimal1 = new BigDecimal("0");
- for (TChargingPile chargingPile : chargingPiles) {
- bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
- }
- BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));
-
- BigDecimal divide = bigDecimal.divide(multiply, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- record.setP1(divide);
-
+ List<TChargingPile> chargingPiles = tChargingPiles.stream().filter(s->s.getSiteId().equals(record.getId())).collect(Collectors.toList());
+ BigDecimal bigDecimal1 = chargingPiles.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal::add).orElse(new BigDecimal("0"));
+ BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));
+ BigDecimal divide = BigDecimal.ZERO;
+ if(multiply.compareTo(BigDecimal.ZERO) > 0){
+ divide = bigDecimal.divide(multiply, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ record.setP1(divide);
}
return R.ok(list.getRecords());
}
@@ -332,8 +369,7 @@
return R.ok(divide);
}
- @Resource
- private SiteClient siteClient;
+
@@ -447,7 +483,6 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.pageList(query,isLogin));
}
-
@ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
@@ -456,6 +491,8 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.getMapSiteList(query,isLogin));
}
+
+
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
@@ -476,7 +513,8 @@
}
return AjaxResult.success(siteDetailVO);
}
-
+
+
@ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunList")
public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId,
@@ -489,6 +527,7 @@
public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
}
+
@ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunCount1")
@@ -559,7 +598,8 @@
@RequiresPermissions(value = {"/roleManagement/add", "/roleManagement/info", "/roleManagement/update", "/systemNotification", "/chargingPeriodStatistics",
- "/parkingPaymentOrder", "/generateStatement", "/chargingPile/add", "/chargingPile/select", "/chargingPile/update"}, logical = Logical.OR)
+ "/parkingPaymentOrder", "/generateStatement", "/chargingPile/add", "/chargingPile/select", "/chargingPile/update",
+ "/appUserWhitelist/add", "/appUserWhitelist/update", "/appUserWhitelist/import"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getAllSiteList")
@ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息", "管理后台-系统用户管理", "管理后台-角色管理", "管理后台-系统通知", "管理后台-充电评价"})
@@ -620,9 +660,26 @@
* @return
*/
@PostMapping("/getSiteListPaging")
- public PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize){
+ public PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
+ @RequestParam("ids") List<String> ids, @RequestParam("isOpenSynchronization") Integer isOpenSynchronization){
PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
- PageInfo<Site> page = siteService.lambdaQuery().page(pageInfo);
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1)
+ .in(ids.size() > 0, Site::getId, ids)
+ .eq(-1 != isOpenSynchronization, Site::getIsOpenSynchronization, isOpenSynchronization)
+ .ne(Site::getSiteType, 2).page(pageInfo);
+ return page;
+ }
+ /**
+ * 分页查询站电数据
+ * @param PageNo
+ * @param PageSize
+ * @return
+ */
+ @PostMapping("/getSiteListPagingJianGuan")
+ public PageInfo<Site> getSiteListPagingJianGuan(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
+ @RequestParam("ids") List<String> ids){
+ PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1).in(ids.size() > 0, Site::getId, ids).page(pageInfo);
return page;
}
}
--
Gitblit v1.7.1