From b76a3b11668f243463468af4c13dd3e82718f93b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 10:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java
index 0bcc566..0c364ea 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java
@@ -1,6 +1,8 @@
package com.ruoyi.integration.drainage.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -23,9 +25,16 @@
/**
* 充电设备接口名称
*/
- @Null
+ @NotNull
@JsonProperty("ConnectorName")
private String connectorName;
+ /**
+ * 1：车辆充电设备接口
+ * 2：换电站内的电池箱充电设备接口
+ */
+ @Null
+ @JsonProperty("EquipmentClassification")
+ private Integer equipmentClassification;
/**
* 充电设备接口类型
*/
@@ -37,13 +46,13 @@
*/
@NotNull
@JsonProperty("VoltageUpperLimits")
- private Integer voltageUpperLimits;
+ private BigDecimal voltageUpperLimits;
/**
* 额定电压下限
*/
@NotNull
@JsonProperty("VoltageLowerLimits")
- private Integer voltageLowerLimits;
+ private BigDecimal voltageLowerLimits;
/**
* 额定电流
*/
@@ -66,6 +75,7 @@
* 国家标准
* 1：2011
* 2:2015
+ * 3：兼容2011和2015
*/
@NotNull
@JsonProperty("NationalStandard")
@@ -76,4 +86,28 @@
@Null
@JsonProperty("QRCode")
private String QRCode;
+ @Null
+ @JsonProperty("ConstantVoltageUpperLimits")
+ private BigDecimal constantVoltageUpperLimits;
+ @Null
+ @JsonProperty("ConstantVoltageLowerLimits")
+ private BigDecimal constantVoltageLowerLimits;
+
+ @Null
+ @JsonProperty("ConstantCurrentUpperLimits")
+ private BigDecimal constantCurrentUpperLimits;
+
+ @Null
+ @JsonProperty("ConstantCurrentLowerLimits")
+ private BigDecimal constantCurrentLowerLimits;
+ @NotNull
+ @JsonProperty("AuxPower")
+ private Integer auxPower;
+
+ @NotNull
+ @TableField("OpreateStatus")
+ private Integer opreateStatus;
+ @Null
+ @TableField("OpreateHours")
+ private String opreateHours;
}
--
Gitblit v1.7.1