From 49e31d27943cf1c53f07d67758b67aaeba7db78c Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 30 Oct 2025 16:10:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E7=A7=BB=E5=8A=A8=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E6=A1=A9=E5=88=B0=E5=8F=A6=E4=B8=80=E4=B8=AA=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/mapper/PileBasicInfoMapper.java      |  2 ++
 .../impl/PileBasicInfoServiceImpl.java        |  8 ++++++-
 .../mapper/pile/PileBasicInfoMapper.xml       | 24 +++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java
index e258931a6..4d691cbc3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java
@@ -177,4 +177,6 @@ public interface PileBasicInfoMapper {
 	 * @return
 	 */
     List<PileDetailInfoVO> getPileDetailInfoList(String stationId);
+
+	int movePile2AnotherStation(ReplaceMerchantStationDTO dto);
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 534740ace..b0178d96c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -1324,17 +1324,23 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 		String newStationId = dto.getNewStationId();
 		String stationId = dto.getStationId();
 		List<String> pileSnList = dto.getPileSnList();
+		if (StringUtils.isBlank(newStationId) || CollectionUtils.isEmpty(pileSnList)) {
+			log.error("移动桩到其他站点 参数不能为空");
+			return 0;
+		}
 		// 查询新站点正在使用中的计费模板
 		BillingTemplateVO billingTemplateVO = pileBillingTemplateService.queryUsedBillingTemplateForEV(newStationId);
 		// 对比传来的新站点id与现在桩的站点id是否相等
 		if (StringUtils.equals(newStationId, stationId)) {
 			// 相等，则不修改
+			log.info("移动桩到其他站点 新站点id 与旧站点id 相等，不作修改");
 			return 0;
 		}
 		dto.setUpdateBy(SecurityUtils.getUsername());
 		dto.setUpdateTime(DateUtils.getNowDate());
 		// 修改数据库中桩信息
-		int num = pileBasicInfoMapper.replaceMerchantStationByPileIds(dto);
+		// int num = pileBasicInfoMapper.replaceMerchantStationByPileIds(dto);
+		int num = pileBasicInfoMapper.movePile2AnotherStation(dto);
 		// 异步向桩下发新站点的计费模板
 		for (String pileSn : pileSnList) {
 			CompletableFuture.runAsync(() -> {
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
index 7fc4d22b3..0885f31d4 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
@@ -237,8 +237,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="replaceMerchantStationByPileIds">
         update pile_basic_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="newMerchantId != null">merchant_id = #{newMerchantId},</if>
-            <if test="newStationId != null">station_id = #{newStationId},</if>
+            <if test="merchantId != null">merchant_id = #{merchantId},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
             <if test="chargerPileType != null">
                 business_type = #{chargerPileType,jdbcType=VARCHAR},
             </if>
@@ -476,4 +476,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             t1.station_id = #{stationId,jdbcType=VARCHAR}
     </select>
+
+    <select id="movePile2AnotherStation" resultType="int">
+        update pile_basic_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newMerchantId != null">merchant_id = #{newMerchantId},</if>
+            <if test="newStationId != null">station_id = #{newStationId},</if>
+            <if test="chargerPileType != null">
+                business_type = #{chargerPileType,jdbcType=VARCHAR},
+            </if>
+            <if test="chargerPileType == '1'.toString() "> secret_key = null,</if>
+            <if test="chargerPileType == '2'.toString() "> secret_key = substring(uuid(), 1, 8),</if>
+            <if test="modelId != null">model_id = #{modelId},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id in
+        <foreach collection="pileIdList" item="pileId" open="(" separator="," close=")">
+            #{pileId,jdbcType=BIGINT}
+        </foreach>
+    </select>
 </mapper>