From aa102d2f719e933093792bde37e9d1ba89683044 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 20 May 2024 15:32:39 +0800
Subject: [PATCH] =?UTF-8?q?uploadFirmware=20=E4=B8=8A=E4=BC=A0=E5=9B=BA?=
 =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/common/enums/ykc/PileConnectorStatusEnum.java | 1 +
 .../jsowell/netty/handler/UploadRealTimeMonitorHandler.java   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileConnectorStatusEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileConnectorStatusEnum.java
index e288acf69..45c54eddc 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileConnectorStatusEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileConnectorStatusEnum.java
@@ -9,6 +9,7 @@ public enum PileConnectorStatusEnum {
 	FAULT("01", "故障"),
 	FREE("02", "空闲"),
 	OCCUPIED_CHARGING("03", "充电"),
+	RESERVE("04", "预约中"),
 	;
 	private String value;
 	private String label;
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
index 6c03c31de..fd48e52d4 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
@@ -92,7 +92,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
 		String connectorCode = BytesUtil.bcd2Str(pileConnectorCodeByteArr);
 		realTimeMonitorData.setConnectorCode(connectorCode);
 
-		// 枪口状态 0x00:离线  0x01:故障  0x02:空闲  0x03:充电
+		// 枪口状态 0x00:离线  0x01:故障  0x02:空闲  0x03:充电 0x04 预约中
 		startIndex += length;
 		length = 1;
 		byte[] connectorStatusByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
@@ -250,7 +250,6 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
 		pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, connectorCode, connectorStatus, putGunType);
 
 		// 01表示故障
-		// if (StringUtils.equals(connectorStatus, "01")) {
 		if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FAULT.getValue())) {
 			// 故障原因存入缓存
 			String redisKey = CacheConstants.PILE_HARDWARE_FAULT + pileSn + connectorCode;
@@ -258,7 +257,6 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
 		}
 
 		// 03表示充电中
-		// if (StringUtils.equals(connectorStatus, "03")) {
 		if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.OCCUPIED_CHARGING.getValue())) {
 			// 默认保存到redis
 			boolean saveRedisFlag = true;