From fd15e6f7dd6a2f6bccf27a8b06fc60211e7df28e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 28 九月 2026 09:05:49 +0800
Subject: [PATCH] Merge branch '2.3' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.3
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/emind/service/EmindEnergyChainManagementService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/emind/service/EmindEnergyChainManagementService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/emind/service/EmindEnergyChainManagementService.java
index 0299a0a..20fe6af 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/emind/service/EmindEnergyChainManagementService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/emind/service/EmindEnergyChainManagementService.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.other.emind.domain.EmindEnergyChain;
+import com.ruoyi.other.emind.domain.EmindEnergyChainDetail;
import com.ruoyi.other.emind.domain.EmindStation;
import com.ruoyi.other.emind.dto.EmindEnergyChainPageQuery;
import com.ruoyi.other.emind.mapper.EmindEnergyChainMapper;
import com.ruoyi.other.emind.mapper.EmindStationMapper;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -14,32 +16,49 @@
import java.time.Clock;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class EmindEnergyChainManagementService {
private final EmindEnergyChainMapper mapper;
private final EmindStationMapper stationMapper;
private final Clock clock;
+ private final EmindEnergyChainDetailService emindEnergyChainDetailService;
@Autowired
public EmindEnergyChainManagementService(EmindEnergyChainMapper mapper,
- EmindStationMapper stationMapper) {
- this(mapper, stationMapper, Clock.systemDefaultZone());
+ EmindStationMapper stationMapper, EmindEnergyChainDetailService emindEnergyChainDetailService) {
+ this(mapper, stationMapper, Clock.systemDefaultZone(), emindEnergyChainDetailService);
}
EmindEnergyChainManagementService(EmindEnergyChainMapper mapper,
EmindStationMapper stationMapper,
- Clock clock) {
+ Clock clock, EmindEnergyChainDetailService emindEnergyChainDetailService) {
this.mapper = mapper;
this.stationMapper = stationMapper;
this.clock = clock;
+ this.emindEnergyChainDetailService = emindEnergyChainDetailService;
}
public IPage<EmindEnergyChain> page(EmindEnergyChainPageQuery query) {
int pageNumber = query.getPageCurr() == null || query.getPageCurr() < 1 ? 1 : query.getPageCurr();
int pageSize = query.getPageSize() == null || query.getPageSize() < 1
? 10 : Math.min(query.getPageSize(), 100);
- return mapper.selectManagementPage(Page.of(pageNumber, pageSize), query);
+ IPage<EmindEnergyChain> pageData = mapper.selectManagementPage(Page.of(pageNumber, pageSize), query);
+ if(CollectionUtils.isNotEmpty(pageData.getRecords())) {
+ List<String> stationTypeList = pageData.getRecords().stream().filter(r -> "欧力特".equals(r.getPlatformName())).map(EmindEnergyChain::getStationType).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(stationTypeList)) {
+ List<EmindEnergyChainDetail> chainDetails = emindEnergyChainDetailService.getByStationTypes(stationTypeList);
+ if(CollectionUtils.isNotEmpty(chainDetails)) {
+ pageData.getRecords().forEach(rd -> chainDetails.forEach(cd -> {
+ if(cd.getStationType().equals(rd.getStationType())) {
+ rd.setDetail(cd.getDetail());
+ }
+ }));
+ }
+ }
+ }
+ return pageData;
}
@Transactional(rollbackFor = Exception.class)
@@ -97,5 +116,6 @@
target.setElinkId(input.getElinkId());
target.setUuid(input.getUuid().trim());
target.setElinkName(input.getElinkName().trim());
+ target.setStationType(input.getStationType());
}
}
--
Gitblit v1.7.1