From 1d1e3c49ebd29144b2f6ce8710523bae763b855b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 14:38:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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