From 583d0c0d31f3de2ae87043660706cfa0cb8f1126 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 17:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
index 3846d8f..acfc5b1 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
@@ -35,35 +35,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "充电枪编号")
+ @ApiModelProperty(value = "充电枪编号", required = true)
@TableField("code")
private String code;
- @ApiModelProperty(value = "站点id")
+ @ApiModelProperty(value = "站点id", required = true)
@TableField("site_id")
private Integer siteId;
- @ApiModelProperty(value = "合作商id")
+ @ApiModelProperty(value = "合作商id", required = true)
@TableField("partner_id")
private Integer partnerId;
- @ApiModelProperty(value = "充电桩id")
+ @ApiModelProperty(value = "充电桩id", required = true)
@TableField("charging_pile_id")
private Integer chargingPileId;
- @ApiModelProperty(value = "充电枪名称")
+ @ApiModelProperty(value = "充电枪名称", required = true)
@TableField("name")
private String name;
- @ApiModelProperty(value = "充电枪类型（0=其他，1=家用插座（模式2），2=交流接口插座（模式3，连接方式B），3=交流接口插头（带枪线，模式3，连接方式C）4=直流接口枪头（带枪线，模式4）5=无线充电座）")
+ @ApiModelProperty(value = "充电枪类型（0=其他，1=家用插座（模式2），2=交流接口插座（模式3，连接方式B），3=交流接口插头（带枪线，模式3，连接方式C）4=直流接口枪头（带枪线，模式4）5=无线充电座）", required = true)
@TableField("type")
private Integer type;
- @ApiModelProperty(value = "充电枪状态（1=离线，2=空闲，3=占用（未充电），4=占用（充电中），5=占用（已充满），6=占用（预约锁定），7=故障）")
+ @ApiModelProperty(value = "充电枪状态（1=离线，2=空闲，3=占用（未充电），4=占用（充电中），5=占用（已充满），6=占用（预约锁定），7=故障）", required = true)
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "充电模式（1=超级快充，2=快充，3=慢充）")
+ @ApiModelProperty(value = "充电模式（1=超级快充，2=快充，3=慢充）", required = true)
@TableField("charge_mode")
private Integer chargeMode;
@@ -71,21 +71,25 @@
@TableField("accounting_strategy_id")
private Integer accountingStrategyId;
- @ApiModelProperty(value = "额定电压上限")
+ @ApiModelProperty(value = "额定电压上限", required = true)
@TableField("upper_rated_voltage")
private BigDecimal upperRatedVoltage;
- @ApiModelProperty(value = "额定电压下限")
+ @ApiModelProperty(value = "额定电压下限", required = true)
@TableField("lower_limit_of_rated_voltage")
private BigDecimal lowerLimitOfRatedVoltage;
- @ApiModelProperty(value = "额定电流")
+ @ApiModelProperty(value = "额定电流", required = true)
@TableField("rated_current")
private BigDecimal ratedCurrent;
- @ApiModelProperty(value = "额定功率")
+ @ApiModelProperty(value = "额定功率", required = true)
@TableField("rated_power")
private BigDecimal ratedPower;
+
+ @ApiModelProperty(value = "实时充电功率", required = true)
+ @TableField("charging_power")
+ private BigDecimal chargingPower;
@ApiModelProperty(value = "车位号")
@TableField("parking_number")
@@ -99,7 +103,9 @@
@TableField("parking_lock_state")
private Integer parkingLockState;
- @ApiModelProperty(value = "国家标准")
+ @ApiModelProperty(value = "国家标准 1：2011\n" +
+ "2：2015\n" +
+ "3：兼容2011和2015", required = true)
@TableField("national_standard")
private String nationalStandard;
@@ -107,4 +113,39 @@
@TableField("remark")
private String remark;
+ @ApiModelProperty(value = "已充电百分比")
+ @TableField(exist = false)
+ private Integer soc;
+
+ @ApiModelProperty(value = "完整编号（桩号+抢号）")
+ @TableField("fullNumber")
+ private String fullNumber;
+ @ApiModelProperty(value = "2.0修改字段 设备接口分类 1：车辆充电设备接口\n" +
+ "2：换电站内的电池箱充电设备\n" +
+ "接口" , required = true)
+ @TableField("equipment_classification")
+ private Integer equipmentClassification;
+
+ @ApiModelProperty(value = "2.0修改字段-恒功率电压上限", required = false)
+ @TableField("constant_voltage_upper_limits")
+ private BigDecimal constantVoltageUpperLimits;
+ @ApiModelProperty(value = "2.0修改字段-恒功率电压下限", required = false)
+ @TableField("constant_voltage_lower_limits")
+ private BigDecimal constantVoltageLowerLimits;
+
+ @ApiModelProperty(value = "2.0修改字段-恒功率电流上限", required = false)
+ @TableField("constant_current_upper_limits")
+ private BigDecimal constantCurrentUpperLimits;
+ @ApiModelProperty(value = "2.0修改字段-恒功率电流下限", required = false)
+ @TableField("constant_current_lower_limits")
+ private BigDecimal constantCurrentLowerLimits;
+ @ApiModelProperty(value = "2.0修改字段-辅助电源 1：12V2：24V3：兼容12V和24V",required = true)
+ @TableField("aux_power")
+ private Integer auxPower;
+ @ApiModelProperty(value = "2.0修改字段-运营状态0：未知1：建设中5：关闭下线6：维护中50：正常使用",required = true)
+ @TableField("opreate_status")
+ private Integer opreateStatus;
+ @ApiModelProperty(value = "2.0修改字段-运营时间描述")
+ @TableField("opreate_hours")
+ private String opreateHours;
}
--
Gitblit v1.7.1