From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java
index 695d666..215b381 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java
@@ -1,5 +1,6 @@
 package com.ruoyi.integration.drainage.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -16,7 +17,8 @@
 	 * 充电设备接口编码
 	 */
 	@NotNull
-	private String ConnectorID;
+	@JsonProperty("ConnectorID")
+	private String connectorID;
 	/**
 	 * 充电设备接口状态
 	 * 0:离网
@@ -27,7 +29,8 @@
 	 * 255:故障
 	 */
 	@NotNull
-	private Integer Status;
+	@JsonProperty("Status")
+	private Integer status;
 	/**
 	 * 车位状态
 	 * 0:未知
@@ -35,7 +38,8 @@
 	 * 50:占用
 	 */
 	@Null
-	private Integer ParkStatus;
+	@JsonProperty("ParkStatus")
+	private Integer parkStatus;
 	/**
 	 * 地锁状态
 	 * 0:未知
@@ -43,5 +47,9 @@
 	 * 50:已上锁
 	 */
 	@Null
-	private Integer LookStatus;
+	@JsonProperty("LookStatus")
+	private Integer lookStatus;
+
+	@JsonProperty("ConnectorStatusInfo")
+	private ConnectorStatusInfo connectorStatusInfo;
 }

--
Gitblit v1.7.1