From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期三, 28 五月 2025 16:45:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev --- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 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..e603f9e 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,32 @@ * 50:已上锁 */ @Null - private Integer LookStatus; + @JsonProperty("LookStatus") + private Integer lookStatus; + + @JsonProperty("ConnectorStatusInfo") + private ConnectorStatusInfo connectorStatusInfo; + + + @JsonProperty("OperatorID") + private String OperatorID; + @JsonProperty("EquipmentOwnerID") + private String EquipmentOwnerID; + @JsonProperty("StationID") + private String StationID; + @JsonProperty("EquipmentID") + private String EquipmentID; + /** + * 1:车辆充电设备接口 + * 2:换电站内的电池箱充 + * 电设备接口 + */ + @JsonProperty("EquipmentClassification") + private Integer EquipmentClassification; + /** + * 本次状态变化的时间, + * 格式“yyyy-MM-dd HH:mm:ss + */ + @JsonProperty("UpdateTime") + private String UpdateTime; } -- Gitblit v1.7.1