From 87dcd22d5b1b1eb951cc4abdd8b64e733928ca00 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 四月 2025 11:38:16 +0800
Subject: [PATCH] 修改查询报表bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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 8fefa8f..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
- private String ConnectorID;
+ @JsonProperty("ConnectorID")
+ private String connectorID;
/**
* 充电设备接口名称
*/
+ @NotNull
+ @JsonProperty("ConnectorName")
+ private String connectorName;
+ /**
+ * 1：车辆充电设备接口
+ * 2：换电站内的电池箱充电设备接口
+ */
@Null
- private String ConnectorName;
+ @JsonProperty("EquipmentClassification")
+ private Integer equipmentClassification;
/**
* 充电设备接口类型
*/
@NotNull
- private Integer ConnectorType;
+ @JsonProperty("ConnectorType")
+ private Integer connectorType;
/**
* 额定电压上限
*/
@NotNull
- private Integer VoltageUpperLimits;
+ @JsonProperty("VoltageUpperLimits")
+ private BigDecimal voltageUpperLimits;
/**
* 额定电压下限
*/
@NotNull
- private Integer VoltageLowerLimits;
+ @JsonProperty("VoltageLowerLimits")
+ private BigDecimal voltageLowerLimits;
/**
* 额定电流
*/
@NotNull
- private Integer Current;
+ @JsonProperty("Current")
+ private Integer current;
/**
* 额定功率
*/
@NotNull
- private BigDecimal Power;
+ @JsonProperty("Power")
+ private BigDecimal power;
/**
* 车位号
*/
@Null
- private String ParkNo;
+ @JsonProperty("ParkNo")
+ private String parkNo;
/**
* 国家标准
* 1：2011
* 2:2015
+ * 3：兼容2011和2015
*/
@NotNull
- private Integer NationalStandard;
+ @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