diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/domain/XhpcChargingPile.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/domain/XhpcChargingPile.java index 2876998a..a767fbdc 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/domain/XhpcChargingPile.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/domain/XhpcChargingPile.java @@ -46,7 +46,7 @@ public class XhpcChargingPile extends BaseEntity { @Column(name = "serial_number", length = 30) private String serialNumber; - @Column(name = "type") + @Column(name = "connector_type") private Integer type; @Column(name = "program_version", length = 20) @@ -88,9 +88,22 @@ public class XhpcChargingPile extends BaseEntity { @Column(name = "connector_type") private Integer connectorType; + @Column(name = "equipment_type") + private Integer equipmentType; + @Column(name = "current") private Integer current; + public Integer getEquipmentType() { + + return equipmentType; + } + + public void setEquipmentType(Integer equipmentType) { + + this.equipmentType = equipmentType; + } + public Integer getCurrent() { return current; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java index c51d118f..d7eee1bc 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java @@ -249,13 +249,14 @@ public class QueryStationsInfoController { Example example = Example.of(pileExample); XhpcChargingPile xhpcChargingPile = xhpcChargingPileRepository.findOne(example).orElse(null); if (xhpcChargingPile != null) { - cachePile.put("connectorType", xhpcChargingPile.getType() == null ? 4 : xhpcChargingPile.getType()); + cachePile.put("connectorType", xhpcChargingPile.getConnectorType() == null ? 4 : + xhpcChargingPile.getConnectorType()); cachePile.put("voltageUpperLimits", xhpcChargingPile.getMaxVoltage().intValue()); cachePile.put("voltageLowerLimits", xhpcChargingPile.getMinVoltage().intValue()); cachePile.put("currentLimit", xhpcChargingPile.getCurrent()); cachePile.put("power", xhpcChargingPile.getPower()); cachePile.put("nationalStandard", xhpcChargingPile.getNationalStandard().equals("2011") ? 1 : 2); - cachePile.put("equipmentType", xhpcChargingPile.getType()); + cachePile.put("equipmentType", xhpcChargingPile.getEquipmentType()); REDIS.setCacheMap("pile:".concat(pileNo), cachePile); } }