From 5f5160c92ecc90c704dc191216342e958148e6b2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 30 Nov 2023 09:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=20=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A9=E5=92=8C=E8=AE=A1=E8=B4=B9=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IPileBillingTemplateService.java  |  1 +
 .../pile/service/PileRemoteService.java       | 19 +++++++++----------
 .../impl/PileBillingTemplateServiceImpl.java  |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java
index e59ff55fe..5012dff99 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java
@@ -146,6 +146,7 @@ public interface IPileBillingTemplateService {
 	 *
 	 * @param relationList
 	 */
+	@Deprecated
 	void insertPileBillingRelation(List<PileBillingRelation> relationList);
 
 	/**
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 b2adef7b6..b4ad9a574 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
@@ -4,7 +4,6 @@ import com.google.common.collect.Lists;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.StringUtils;
-import com.jsowell.pile.domain.PileBillingRelation;
 import com.jsowell.pile.domain.PileBillingTemplate;
 import com.jsowell.pile.domain.PileFirmwareInfo;
 import com.jsowell.pile.domain.ykcCommond.*;
@@ -166,22 +165,22 @@ public class PileRemoteService {
 		}
 
 		// 保存计费模板和桩的关系
-		List<PileBillingRelation> relationList = Lists.newArrayList();
+		// List<PileBillingRelation> relationList = Lists.newArrayList();
 		for (PileDetailVO pileInfoVO : pileList) {
 			// push
 			publishPileBillingTemplate(pileInfoVO.getPileSn(), billingTemplateVO);
 
 			// 入库
-			relationList.add(PileBillingRelation.builder()
-					.pileSn(pileInfoVO.getPileSn())
-					.billingTemplateCode(billingTemplateVO.getTemplateCode())
-					.stationId(dto.getStationId())
-					.build());
+			// relationList.add(PileBillingRelation.builder()
+			// 		.pileSn(pileInfoVO.getPileSn())
+			// 		.billingTemplateCode(billingTemplateVO.getTemplateCode())
+			// 		.stationId(dto.getStationId())
+			// 		.build());
 		}
 
-		if (CollectionUtils.isNotEmpty(relationList)) {
-			pileBillingTemplateService.insertPileBillingRelation(relationList);
-		}
+		// if (CollectionUtils.isNotEmpty(relationList)) {
+		// 	pileBillingTemplateService.insertPileBillingRelation(relationList);
+		// }
 
 		// 修改计费模板状态
 		pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId());
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 e2a316b2e..49d68ea23 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
@@ -734,6 +734,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
         return pileBillingTemplateMapper.selectBillingTemplateByTemplateId(templateId);
     }
 
+    @Deprecated
     @Override
     public void insertPileBillingRelation(List<PileBillingRelation> relationList) {
         if (CollectionUtils.isEmpty(relationList)) {