diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index f5f7cfc8..f21e890e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -34,6 +34,8 @@ + + @@ -59,7 +61,9 @@ update_time, update_by, remark, - rate_model_id + rate_model_id, + installed_total_power, + running_total_power from xhpc_charging_station @@ -136,6 +140,8 @@ update_by, remark, rate_model_id, + installed_total_power, + running_total_power, #{chargingStationId}, @@ -161,6 +167,8 @@ #{updateBy}, #{remark}, #{rateModelId}, + #{installedTotalPower}, + #{runningTotalPower}, @@ -195,7 +203,9 @@ station_type = #{stationType}, operator_id_evcs = #{operatorIdEvcs}, service_tel = #{serviceTel}, - park_nums = #{parkNums} + park_nums = #{parkNums}, + installed_total_power=#{installedTotalPower}, + running_total_power=#{runningTotalPower}, where charging_station_id = #{chargingStationId} @@ -550,8 +560,10 @@ service_tel, - park_nums + park_nums, + installed_total_power, + running_total_power, @@ -639,8 +651,10 @@ #{serviceTel}, - #{parkNums} + #{parkNums}, + #{installedTotalPower}, + #{runningTotalPower}, diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java index fdd72284..65fad615 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java @@ -17,6 +17,31 @@ public class ChargingStationDto { private String name; private String serviceTel; private Integer parkNums; + /** + * 装机总功率(单位:kw) + */ + private Integer installedTotalPower; + + /** + * 运行最大总功率(单位:%) + */ + private Integer runningTotalPower; + + public Integer getInstalledTotalPower() { + return installedTotalPower; + } + + public void setInstalledTotalPower(Integer installedTotalPower) { + this.installedTotalPower = installedTotalPower; + } + + public Integer getRunningTotalPower() { + return runningTotalPower; + } + + public void setRunningTotalPower(Integer runningTotalPower) { + this.runningTotalPower = runningTotalPower; + } public String getAddress() { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java index 395e697e..7127a6d1 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java @@ -110,6 +110,31 @@ public class XhpcChargingStation extends BaseEntity { */ private String serviceTel; + /** + * 装机总功率(单位:kw) + */ + private Integer installedTotalPower; + + /** + * 运行最大总功率(单位:%) + */ + private Integer runningTotalPower; + + public Integer getInstalledTotalPower() { + return installedTotalPower; + } + + public void setInstalledTotalPower(Integer installedTotalPower) { + this.installedTotalPower = installedTotalPower; + } + + public Integer getRunningTotalPower() { + return runningTotalPower; + } + + public void setRunningTotalPower(Integer runningTotalPower) { + this.runningTotalPower = runningTotalPower; + } /** *侧位数量 diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml index cecc907c..b50e6c72 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -34,6 +34,8 @@ + + @@ -59,7 +61,9 @@ update_time, update_by, remark, - rate_model_id + rate_model_id, + installed_total_power, + running_total_power from xhpc_charging_station