From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
index 8e6f6e9..119f6ac 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.chargingPile.api.vo.TParkingRecordPageInfoVO;
import com.ruoyi.chargingPile.api.vo.TParkingRecordVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.dto.ParkingRecordQueryDto;
import com.ruoyi.chargingPile.mapper.SiteMapper;
import com.ruoyi.chargingPile.mapper.TParkingLotMapper;
import com.ruoyi.chargingPile.mapper.TParkingRecordMapper;
@@ -21,6 +22,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -50,17 +52,57 @@
// 查询站点的停车场id
if(Objects.nonNull(query.getSiteId())){
Site site = siteMapper.selectById(query.getSiteId());
- List<TParkingLot> tParkingLots = parkingLotMapper.selectList(Wrappers.lambdaQuery(TParkingLot.class)
- .eq(TParkingLot::getSiteId, site.getId()));
- List<Integer> lotIds = tParkingLots.stream().map(TParkingLot::getId).collect(Collectors.toList());
- query.setLotIds(lotIds);
+ if (site!=null){
+ List<TParkingLot> tParkingLots = parkingLotMapper.selectList(Wrappers.lambdaQuery(TParkingLot.class)
+ .eq(TParkingLot::getSiteId, site.getId()));
+ List<Integer> lotIds = tParkingLots.stream().map(TParkingLot::getId).collect(Collectors.toList());
+ query.setLotIds(lotIds);
+ }
+
}
PageInfo<TParkingRecordVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<TParkingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
pageInfo.setRecords(list);
// 查询总数
TParkingRecordPageInfoVO infoVO = this.baseMapper.getParkingRecordCount(query);
+ if (infoVO==null){
+ infoVO = new TParkingRecordPageInfoVO();
+ infoVO.setTimeoutAmountSum(new BigDecimal("0"));
+ infoVO.setOrderCount(0);
+ infoVO.setParkingDurationSum(0);
+ infoVO.setFeeDurationSum(0);
+ }
infoVO.setParkingRecordVOS(pageInfo);
return infoVO;
}
+
+ @Override
+ public List<Map<String, Object>> parkingData(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.parkingData(parkingRecordQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> parkingDataByDate(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.parkingDataByDate(parkingRecordQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCarColor(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.getCarColor(parkingRecordQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> getOutType(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.getOutType(parkingRecordQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> getIsCharge(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.getIsCharge(parkingRecordQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> income(ParkingRecordQueryDto parkingRecordQueryDto) {
+ return this.baseMapper.income(parkingRecordQueryDto);
+ }
}
--
Gitblit v1.7.1