From 08fa56962b2222dee353bd24b23dd2d4b2908b06 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 21 Aug 2024 14:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...servationChargingStartupResultHandler.java | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
index c491825e9..149c1e9a1 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java
@@ -84,22 +84,26 @@ public class ReservationChargingStartupResultHandler extends AbstractYkcHandler
 
         log.info("[===预约充电启动结果上送===]交易流水号:{}, 桩编号:{}, 枪号:{}, vin:{}, 启动结果:{}, 失败原因:{}",
                 transactionCode, pileSn, connectorCode, vinCode, startupResultMsg, failReasonMsg);
-
-        ReservationChargingStartupResult chargingStartupResult = ReservationChargingStartupResult.builder()
-                .transactionCode(transactionCode)
-                .pileSn(pileSn)
-                .connectorCode(connectorCode)
-                .vinCode(vinCode)
-                .startupResult(startupResultMsg)
-                .failReason(failReasonMsg)
-                .build();
-        pileBasicInfoService.startupResult(chargingStartupResult);
-
         /*
 		应答
 		确认结果	0x00 成功 0x01 失败
 		 */
         byte[] confirmResultBytes = Constants.zeroByteArray;
+        try {
+            ReservationChargingStartupResult chargingStartupResult = ReservationChargingStartupResult.builder()
+                    .transactionCode(transactionCode)
+                    .pileSn(pileSn)
+                    .connectorCode(connectorCode)
+                    .vinCode(vinCode)
+                    .startupResult(startupResultMsg)
+                    .failReason(failReasonMsg)
+                    .build();
+            pileBasicInfoService.startupResult(chargingStartupResult);
+        }catch (Exception e) {
+            log.error("预约充电启动结果上送error", e);
+            confirmResultBytes = Constants.oneByteArray;
+        }
+
         byte[] concatMsgBody = Bytes.concat(transactionCodeByteArr, pileSnByteArr, connectorCodeByteArr, confirmResultBytes);
         return getResult(ykcDataProtocol, concatMsgBody);
     }