From a0ab309134b9ce4f0be8607a55993fb9b67accd0 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 21 Nov 2024 14:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=E6=A1=A9=E8=AE=A1=E8=B4=B9=E6=A8=A1=E6=9D=BF=20=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/service/PileRemoteService.java | 17 +++++++++++------
 .../impl/PileBillingTemplateServiceImpl.java    |  7 +++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
index de1218966..95b08ddd7 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
@@ -35,6 +35,7 @@ import java.net.UnknownHostException;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class PileRemoteService {
@@ -289,16 +290,20 @@ public class PileRemoteService {
 		pileBillingTemplate.setId(Long.valueOf(billingTemplateVO.getTemplateId()));
 		pileBillingTemplate.setPublishTime(new Date());
 		pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate);
-
-		// 获取到站点下所有的桩, 下发计费模板, 电单车不支持
-		if (StringUtils.equals(billingTemplateVO.getDeviceType(), Constants.ONE)) {
-			List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId())));
-			if (CollectionUtils.isNotEmpty(pileList)) {
+		// 获取到站点下所有的桩
+		List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId())));
+		if (CollectionUtils.isNotEmpty(pileList)) {
+			// 删除缓存
+			List<String> collect = pileList.parallelStream()
+					.map(vo -> CacheConstants.BILLING_TEMPLATE_BY_PILE_SN + vo.getPileSn())
+					.collect(Collectors.toList());
+			redisCache.deleteObject(collect);
+			// 下发计费模板, 电单车不支持
+			if (StringUtils.equals(billingTemplateVO.getDeviceType(), Constants.ONE)) {
 				// 下发指令
 				pileList.parallelStream().forEach(pileInfoVO -> publishPileBillingTemplate(pileInfoVO.getPileSn(), billingTemplateVO));
 			}
 		}
-
 		// 修改计费模板状态
 		pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType());
 		return true;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
index 888c5b0da..e39e0a588 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
@@ -26,10 +26,7 @@ import com.jsowell.pile.transaction.service.TransactionService;
 import com.jsowell.pile.util.UserUtils;
 import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
-import com.jsowell.pile.vo.web.BillingDetailVO;
-import com.jsowell.pile.vo.web.BillingTemplateVO;
-import com.jsowell.pile.vo.web.EchoBillingTemplateVO;
-import com.jsowell.pile.vo.web.MemberGroupVO;
+import com.jsowell.pile.vo.web.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -586,6 +583,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         // 通过站点id清缓存
         if (StringUtils.isNotBlank(stationId)) {
             redisKeyList.add(CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId);
+
+            // 删除充电桩缓存
         }
         // 通过计费模板id 清缓存
         if (templateId != null) {