From 0d521fd34fb32e7bd0e7e4ed76e73d1eb4cc3414 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 12 Jul 2024 15:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5=E6=A1=A9?=
 =?UTF-8?q?=E6=97=B6,=20=E8=BF=90=E8=90=A5=E6=A1=A9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=AF=86=E9=92=A5,=20=E4=B8=AA=E4=BA=BA=E6=A1=A9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=AF=86=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/pile/PileBasicInfoController.java  |  2 +-
 .../pile/service/impl/PileBasicInfoServiceImpl.java   | 11 +++++++----
 .../resources/mapper/pile/PileBasicInfoMapper.xml     |  6 +++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
index 6b5996b57..b164a6fa2 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
@@ -155,7 +155,7 @@ public class PileBasicInfoController extends BaseController {
 	}
 
 	/**
-	 * 批量更新充电桩
+	 * 批量更新充电桩/批量修改充电桩
 	 * 运营商 站点
 	 */
 	@PostMapping("/batchUpdatePileList")
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 c3411598d..f352ea081 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
@@ -11,10 +11,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
-import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
-import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
-import com.jsowell.common.enums.ykc.PileStatusEnum;
-import com.jsowell.common.enums.ykc.ReturnCodeEnum;
+import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.*;
 import com.jsowell.pile.domain.PileBasicInfo;
@@ -379,6 +376,12 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 			if (CollectionUtils.isNotEmpty(connectorInfoList)) {
 				pileConnectorInfoService.batchInsertConnectorInfo(connectorInfoList);
 			}
+
+			// if (StringUtils.equals(BusinessTypeEnum.INDIVIDUAL_PILE.getValue(), dto.getChargerPileType())) {
+			// 	// 个人桩生成一个八位的密钥（字母加数字）
+			// 	String secretKey = RandomStringUtils.randomAlphanumeric(8).toUpperCase(Locale.ROOT);
+			// 	basicInfo.setSecretKey(secretKey);
+			// }
 		}
 		return num;
 	}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
index b5a2714e1..98b69021b 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
@@ -231,7 +231,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <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>
+            <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>