autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-28 06:55:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature-integrated_with_JCPP

Browse Source
This commit is contained in:
Guoqs
2026-01-08 09:38:32 +08:00
parent d9259ae856 3be12178fd
commit 6d37821293
20 changed files with 573 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -459,4 +459,11 @@ public interface OrderBasicInfoMapper {
* @return
*/
List<IndexPlatformProfitVO> getInsuranceAmount(@Param("dto") IndexQueryDTO dto);
/**
* 批量查询充电枪信息
* @param chargingConnectorCodeList
* @return
*/
List<PileConnectorInfoVO> batchQueryChargingConnectorInfo(@Param("pileConnectorCodes") List<String> chargingConnectorCodeList);
}

8
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java
View File

@@ -136,6 +136,14 @@ public interface PileConnectorInfoMapper {
*/
List<ConnectorInfoVO> batchSelectConnectorList(@Param("stationIds") List<String> stationIds);
/**
* 此方法与上面方法一样，只是多加了status字段
* @param stationIds
* @param status
* @return
*/
List<ConnectorInfoVO> batchSelectConnectorListByStatus(@Param("stationIds") List<String> stationIds, @Param("status") String status);
/**
* 查询异常设备数量
* @param stationId

7
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
View File

@@ -133,4 +133,11 @@ public interface PileStationInfoMapper {
* @return
*/
List<UserFrequentedStationInfo> queryUserFrequentedStation(@Param("memberId") String memberId ,@Param("startTime") String startTime ,@Param("endTime") String endTime);
/**
* 通过运营商ids查询站点ids
* @param merchantIdList
* @return
*/
List<String> getStationIdsByMerchantIds(@Param("merchantIds") List<String> merchantIdList);
}

14
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
View File

@@ -661,4 +661,18 @@ public interface OrderBasicInfoService{
* @return
*/
List<IndexPlatformProfitVO> getInsuranceAmount(IndexQueryDTO dto);
/**
* 批量查询充电枪信息
* @param chargingConnectorCodeList
* @return
*/
List<PileConnectorInfoVO> batchQueryChargingConnectorInfo(List<String> chargingConnectorCodeList);
/**
* 批量查询充电枪实时数据
* @param transactionCodeList
* @return
*/
List<RealTimeMonitorData> getRealTimeMonitorDataList(List<String> transactionCodeList);
}

10
jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java
View File

@@ -153,7 +153,7 @@ public interface PileConnectorInfoService {
/**
* 通过站点id和枪口状态查询枪口列表
*/
BusinessConnectorInfoVO getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto);
PageResponse getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto);
/**
* 通过查询参数查询枪口信息
@@ -183,4 +183,12 @@ public interface PileConnectorInfoService {
* @return
*/
int queryAbnormalDeviceCount(String id);
/**
* 查询充电桩枪口状态数量
* @param stationIds
* @param connectorStatus
* @return
*/
public Map<String, Object> getConnectorStatusNum(List<String> stationIds, String connectorStatus);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java
View File

@@ -216,5 +216,10 @@ public interface PileStationInfoService {
*/
PageResponse queryUserFrequentedStation(QueryStationDTO dto);
/**
* 通过运营商ids查询站点ids
* @param merchantIdList
* @return
*/
List<String> getStationIdsByMerchantIds(List<String> merchantIdList);
}

102
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -6255,6 +6255,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
}
/**
<<<<<<< HEAD
* 运营端小程序查询订单
* @param dto 查询条件
* @return 订单查询结果
@@ -6302,10 +6303,32 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
long orderCount = pageInfo.getTotal();
// 3. 统计总金额（使用聚合 SQL，避免查询所有数据到内存
OrderStatisticsVO statistics = orderBasicInfoMapper.countBusinessOrderStatistics(queryOrderDTO);
BigDecimal totalOrderAmount = statistics != null && statistics.getOrderAmount() != null
? statistics.getOrderAmount() : BigDecimal.ZERO;
// 3. 统计总金额 (分批处理)
BigDecimal totalOrderAmount = BigDecimal.ZERO;
int batchSize = 500; // 每批最多 500 个站点ID
if (stationIdList.size() > batchSize) {
// 分批查询统计
List<List<String>> batches = Lists.partition(stationIdList, batchSize);
for (List<String> batch : batches) {
QueryOrderDTO batchDTO = QueryOrderDTO.builder()
.stationIdList(batch)
.startTime(dto.getCreateTime())
.endTime(dto.getEndTime())
.orderStatus(dto.getOrderStatus())
.startMode(dto.getStartMode())
.stationName(dto.getStationName())
.build();
OrderStatisticsVO batchStatistics = orderBasicInfoMapper.countBusinessOrderStatistics(batchDTO);
if (batchStatistics != null && batchStatistics.getOrderAmount() != null) {
totalOrderAmount = totalOrderAmount.add(batchStatistics.getOrderAmount());
}
}
} else {
// 直接查询
OrderStatisticsVO statistics = orderBasicInfoMapper.countBusinessOrderStatistics(queryOrderDTO);
totalOrderAmount = statistics != null && statistics.getOrderAmount() != null
? statistics.getOrderAmount() : BigDecimal.ZERO;
}
//4. 转换为 BusinessOrderListVO
List<BusinessOrderListVO> businessOrderList = orderListVOS.stream()
@@ -6338,6 +6361,77 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.build();
}
/*
* 批量查询充电枪口信息
* @param chargingConnectorCodeList
* @return
*/
@Override
public List<PileConnectorInfoVO> batchQueryChargingConnectorInfo(List<String> chargingConnectorCodeList) {
// 这个infoVOs只有简单数据，没有充电中数据
List<PileConnectorInfoVO> infoVOS = orderBasicInfoMapper.batchQueryChargingConnectorInfo(chargingConnectorCodeList);
List<String> transactionCodes = infoVOS.stream()
.map(PileConnectorInfoVO::getTransactionCode)
.collect(Collectors.toList());
List<RealTimeMonitorData> list = getRealTimeMonitorDataList(transactionCodes);
Map<String, RealTimeMonitorData> bMap = list.stream()
.collect(Collectors.toMap(
RealTimeMonitorData::getPileConnectorCode,
x -> x,
(existing, replacement) -> existing // 如果有重复key，保留第一个
));
for (PileConnectorInfoVO infoVO : infoVOS) {
String pileConnectorCode = infoVO.getPileConnectorCode();
if (pileConnectorCode != null && bMap.containsKey(pileConnectorCode)) {
RealTimeMonitorData realTimeMonitorData = bMap.get(pileConnectorCode);
infoVO.setChargingDegree(new BigDecimal(realTimeMonitorData.getChargingDegree()));
infoVO.setChargingTime(realTimeMonitorData.getSumChargingTime());
infoVO.setSOC(realTimeMonitorData.getSOC());
infoVO.setTimeRemaining(realTimeMonitorData.getTimeRemaining());
}
}
return infoVOS;
}
/**
* 批量查询实时监控数据
* @param transactionCodeList
* @return
*/
@Override
public List<RealTimeMonitorData> getRealTimeMonitorDataList(List<String> transactionCodeList) {
List<RealTimeMonitorData> resultList = new ArrayList<>();
List<String> redisKeys = new ArrayList<>();
for (String transactionCode : transactionCodeList) {
// 截取枪口编号
String pileConnectorCode = transactionCode.substring(0, 16);
redisKeys.add(CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode);
}
// 批量查询多个key值的数据 key: redisKey, value: 最后一条实时数据
// 注意：数据在Redis中以Hash类型存储，field为时间字符串，需要获取所有field后取最新的一条
for (String redisKey : redisKeys) {
try {
Map<String, String> hashData = redisCache.getCacheMap(redisKey);
if (hashData != null && !hashData.isEmpty()) {
// 按时间排序，获取最新的一条数据
String latestJson = hashData.entrySet().stream()
.max(Map.Entry.comparingByKey())
.map(Map.Entry::getValue)
.orElse(null);
if (latestJson != null) {
RealTimeMonitorData data = JSON.parseObject(latestJson, RealTimeMonitorData.class);
resultList.add(data);
}
}
} catch (Exception e) {
logger.error("获取实时监控数据失败，redisKey={}", redisKey, e);
}
}
return resultList;
}
}

157
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.jsowell.common.enums.ykc.PileStatusEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.spring.SpringUtils;
@@ -34,9 +35,13 @@ import com.jsowell.pile.dto.business.QueryConnectorInfoDTO;
import com.jsowell.pile.mapper.PileBasicInfoMapper;
import com.jsowell.pile.mapper.PileConnectorInfoMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.base.LoginUserDetailVO;
import com.jsowell.pile.vo.uniapp.business.BusinessConnectorDetailVO;
import com.jsowell.pile.vo.uniapp.business.BusinessConnectorInfoVO;
import com.jsowell.pile.vo.uniapp.business.BusinessOrderDetailInfoVO;
import com.jsowell.pile.vo.uniapp.customer.OrderVO;
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
import com.jsowell.pile.vo.web.PileDetailVO;
import com.jsowell.pile.vo.web.PileModelInfoVO;
@@ -1053,58 +1058,114 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
/**
* 查询站点枪口列表
*
* @param dto
* @return
*/
@Override
public BusinessConnectorInfoVO getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) {
// 获取登录账号信息
Long deptId = SecurityUtils.getDeptId();
List<String> stationIds = pileMerchantInfoService.queryByMerchantDeptIds(Lists.newArrayList(String.valueOf(deptId)));
String connectorStatus = dto.getConnectorStatus();
int pageNum = dto.getPageNum();
int pageSize = dto.getPageSize();
BusinessConnectorInfoVO vo = new BusinessConnectorInfoVO();
// 根据站点ids查询枪口列表(有缓存)
List<ConnectorInfoVO> connectorInfoVOS = batchSelectConnectorList(stationIds);
// 筛选出枪口编号
List<String> pileConnectorCodeList = connectorInfoVOS.stream()
public PageResponse getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) {
List<PileConnectorInfoVO> list = new ArrayList<>();
List<String> stationIds = dto.getStationIds();
String status = dto.getConnectorStatus();
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
// 分页查询符合条件站点的枪口列表
PageUtils.startPage(pageNum, pageSize);
List<ConnectorInfoVO> connectorInfoVOS = pileConnectorInfoMapper.batchSelectConnectorListByStatus(stationIds, status);
PageInfo<ConnectorInfoVO> pageInfo = new PageInfo<>(connectorInfoVOS);
// 将分页列表中充电中的枪编码筛选出来
List<String> chargingPileConnectorCodeList = connectorInfoVOS.stream()
.filter(connectorInfoVO -> StringUtils.equals(connectorInfoVO.getConnectorStatus()
, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue()))
.map(ConnectorInfoVO::getPileConnectorCode)
.collect(Collectors.toList());
// 批量获取某状态的枪口数量
Map<String, Integer> connectorStatusNumMap = getConnectorStatus(pileConnectorCodeList);
Integer offlineNum = connectorStatusNumMap.get("offlineNum");
Integer freeNum = connectorStatusNumMap.get("freeNum");
Integer occupiedNum = connectorStatusNumMap.get("occupiedNum");
Integer chargingNum = connectorStatusNumMap.get("chargingNum");
Integer faultNum = connectorStatusNumMap.get("faultNum");
vo.setConnectorNum(pileConnectorCodeList.size());
vo.setOfflineConnectorNum(offlineNum);
vo.setFreeConnectorNum(freeNum);
vo.setOccupiedConnectorNum(occupiedNum);
vo.setChargingConnectorNum(chargingNum);
vo.setFaultConnectorNum(faultNum);
List<Long> longStationIds = stationIds.stream()
.map(Long::parseLong) // 或 s -> Long.parseLong(s)
.collect(Collectors.toList());
// 根据站点id和枪口状态查询枪口列表
QueryConnectorListDTO queryConnectorListDTO = QueryConnectorListDTO.builder()
.pageNum(pageNum)
.pageSize(pageSize)
.stationIdList(longStationIds)
.build();
List<PileConnectorInfoVO> pileConnectorInfoVOList = getConnectorInfoListByParams(queryConnectorListDTO);
if (connectorStatus != null) {
// 筛选出符合状态的数据
pileConnectorInfoVOList = pileConnectorInfoVOList.stream()
.filter(x -> x.getStatus() == Integer.parseInt(connectorStatus))
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(chargingPileConnectorCodeList)) {
// 批量查询充电中的各项信息
List<PileConnectorInfoVO> pileConnectorInfoVOS = orderBasicInfoService.batchQueryChargingConnectorInfo(chargingPileConnectorCodeList);
// 将获取到的充电信息详情根据枪口编码将信息set进对应的pageInfo.list中对应的值
for (PileConnectorInfoVO pileConnectorInfoVO : pileConnectorInfoVOS) {
for (ConnectorInfoVO connectorInfoVO : connectorInfoVOS) {
if (StringUtils.equals(pileConnectorInfoVO.getPileConnectorCode(), connectorInfoVO.getPileConnectorCode())) {
connectorInfoVO.setOrderCode(pileConnectorInfoVO.getOrderCode());
connectorInfoVO.setChargeTime(pileConnectorInfoVO.getChargingTime());
connectorInfoVO.setChargeDegree(String.valueOf(pileConnectorInfoVO.getChargingDegree()));
connectorInfoVO.setTimeRemaining(pileConnectorInfoVO.getTimeRemaining());
connectorInfoVO.setSoc(String.valueOf(pileConnectorInfoVO.getSOC()));
}
}
}
}
vo.setPileConnectorInfoVOList(pileConnectorInfoVOList);
return vo;
return PageResponse.builder()
.pageNum(pageInfo.getPageNum())
.pageSize(pageInfo.getPageSize())
.total(pageInfo.getTotal())
.pages(pageInfo.getPages())
.list(connectorInfoVOS)
.build();
}
/**
* 获取站点各状态的枪口数量
* @param stationIds
* @param connectorStatus
* @return
*/
public Map<String, Object> getConnectorStatusNum(List<String> stationIds, String connectorStatus) {
Map<String, Object> map = new LinkedHashMap<>();
List<ConnectorInfoVO> connectorInfoVOS = pileConnectorInfoMapper.batchSelectConnectorListByStatus(stationIds, connectorStatus);
// 初始化对象
int offlineNum = 0;
int freeNum = 0;
int occupiedNum = 0;
int chargingNum = 0;
int hangingNum = 0;
int faultNum = 0;
for (ConnectorInfoVO connectorInfoVO : connectorInfoVOS) {
String status = connectorInfoVO.getConnectorStatus();
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue())) {
// 离网
offlineNum += 1;
}
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.FREE.getValue())) {
// 空闲
freeNum += 1;
}
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OCCUPIED_RESERVED_LOCK.getValue())) {
// 预约锁定（挂起）
hangingNum += 1;
}
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OCCUPIED_NOT_CHARGED.getValue())) {
// 占用未充电
occupiedNum += 1;
}
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) {
// 充电中
chargingNum += 1;
}
if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.FAULT.getValue())) {
// 故障
faultNum += 1;
}
}
// 全部数量
int totalNum = offlineNum + freeNum + occupiedNum + chargingNum + faultNum + hangingNum;
map.put("totalNum", totalNum);
map.put("offlineNum", offlineNum);
map.put("freeNum", freeNum);
map.put("hangingNum", hangingNum);
map.put("occupiedNum", occupiedNum);
map.put("chargingNum", chargingNum);
map.put("faultNum", faultNum);
return map;
}
/**
@@ -1177,9 +1238,15 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
}
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
String startSoc = orderBasicInfo.getStartSoc();
Date chargeStartTime = orderBasicInfo.getChargeStartTime();
String startTime = "-";
if (chargeStartTime != null) {
// 转换成 字符串
startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeStartTime);
}
String endSoc = realTimeMonitorData.getSOC();
detailVO.setChargeStartTime(startTime);
detailVO.setStartSOC(startSoc);
detailVO.setEndSOC(endSoc);
detailVO.setChargeDegree(realTimeMonitorData.getChargingDegree()); // 充电度数

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -1623,4 +1623,14 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
return uniAppQueryStationInfoListV2(dto);
}
/**
* 根据商户ids查询站点ids
* @param merchantIdList
* @return
*/
@Override
public List<String> getStationIdsByMerchantIds(List<String> merchantIdList) {
return pileStationInfoMapper.getStationIdsByMerchantIds(merchantIdList);
}
}

9
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java
View File

@@ -66,4 +66,13 @@ public class ConnectorInfoVO {
*/
private String ratedVoltage;
private String orderCode;
private String chargeDegree;
private String chargeTime;
private String timeRemaining;
private String soc;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessConnectorDetailVO.java
View File

@@ -56,4 +56,9 @@ public class BusinessConnectorDetailVO {
* 故障原因
*/
private String faultReason;
/**
* 充电开始时间
*/
private String chargeStartTime;
}

10
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java
View File

@@ -25,6 +25,11 @@ public class BusinessOrderDetailInfoVO {
private String pileConnectorCode;
/**
* 交易流水号
*/
private String transactionCode;
/**
* 充电次数
*/
@@ -185,4 +190,9 @@ public class BusinessOrderDetailInfoVO {
*/
private String memberId;
/**
* 剩余时间
*/
private String timeRemaining;
}