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/ConnectorInfo.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 48 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 a29fb57..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,5 +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; @@ -17,52 +20,94 @@ * 充电设备接口编码 */ @NotNull + @JsonProperty("ConnectorID") private String connectorID; /** * 充电设备接口名称 */ - @Null + @NotNull + @JsonProperty("ConnectorName") private String connectorName; + /** + * 1:车辆充电设备接口 + * 2:换电站内的电池箱充电设备接口 + */ + @Null + @JsonProperty("EquipmentClassification") + private Integer equipmentClassification; /** * 充电设备接口类型 */ @NotNull + @JsonProperty("ConnectorType") private Integer connectorType; /** * 额定电压上限 */ @NotNull - private Integer voltageUpperLimits; + @JsonProperty("VoltageUpperLimits") + private BigDecimal voltageUpperLimits; /** * 额定电压下限 */ @NotNull - private Integer voltageLowerLimits; + @JsonProperty("VoltageLowerLimits") + private BigDecimal voltageLowerLimits; /** * 额定电流 */ @NotNull + @JsonProperty("Current") private Integer current; /** * 额定功率 */ @NotNull + @JsonProperty("Power") private BigDecimal power; /** * 车位号 */ @Null + @JsonProperty("ParkNo") private String parkNo; /** * 国家标准 * 1:2011 * 2:2015 + * 3:兼容2011和2015 */ @NotNull + @JsonProperty("NationalStandard") private Integer nationalStandard; /** * 枪二维码 */ @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