yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enc.dec working; tbd: sig check, query station info logic

Browse Source
This commit is contained in:
ZZ 2021-09-23 18:36:37 +08:00
parent 166c9c621d
commit f2c8c125a8
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xhpc-modules/xhpc-common/src/main/java/com/xhpc/evcs/domain/XhpcStatisticsTimeInterval.java
View File

@ -1,5 +1,7 @@
package com.xhpc.evcs.domain;
import com.xhpc.common.core.utils.DateUtils;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@ -50,7 +52,7 @@ public class XhpcStatisticsTimeInterval {
public BigDecimal getServicePriceEvcs() {
return servicePriceEvcs;
return servicePriceEvcs == null ? BigDecimal.ZERO : servicePriceEvcs;
}
public void setServicePriceEvcs(BigDecimal servicePriceEvcs) {
@ -60,7 +62,7 @@ public class XhpcStatisticsTimeInterval {
public BigDecimal getElecPriceEvcs() {
return elecPriceEvcs;
return elecPriceEvcs == null ? BigDecimal.ZERO : elecPriceEvcs;
}
public void setElecPriceEvcs(BigDecimal elecPriceEvcs) {
@ -70,7 +72,7 @@ public class XhpcStatisticsTimeInterval {
public String getEndTimeEvcs() {
return endTimeEvcs;
return endTimeEvcs == null ? DateUtils.getTime() : endTimeEvcs;
}
public void setEndTimeEvcs(String endTimeEvcs) {
@ -80,7 +82,7 @@ public class XhpcStatisticsTimeInterval {
public String getStartTimeEvcs() {
return startTimeEvcs;
return startTimeEvcs == null ? DateUtils.getTime() : startTimeEvcs;
}
public void setStartTimeEvcs(String startTimeEvcs) {
@ -110,7 +112,7 @@ public class XhpcStatisticsTimeInterval {
public BigDecimal getChargingDegree() {
return chargingDegree;
return chargingDegree == null ? BigDecimal.ZERO : chargingDegree;
}
public void setChargingDegree(BigDecimal chargingDegree) {

16
xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
View File

@ -201,7 +201,7 @@ public class XhpcHistoryOrder extends BaseEntity {
* 2：有卡启动
* 3：其他无卡启动
*/
private int chargeModelEvcs;
private Integer chargeModelEvcs;
/**
* 实际充电的客户在运营商侧的名称,<=20字符
@ -243,7 +243,7 @@ public class XhpcHistoryOrder extends BaseEntity {
public String getUserNameEvcs() {
return userNameEvcs;
return userNameEvcs == null ? getPhone() : userNameEvcs;
}
public void setUserNameEvcs(String userNameEvcs) {
@ -556,7 +556,7 @@ public class XhpcHistoryOrder extends BaseEntity {
public Double getTotalPower() {
return totalPower;
return totalPower == null ? 0 : totalPower;
}
public void setTotalPower(Double totalPower) {
@ -566,7 +566,7 @@ public class XhpcHistoryOrder extends BaseEntity {
public Date getStartTime() {
return startTime;
return startTime == null ? getCreateTime() : startTime;
}
public void setStartTime(Date startTime) {
@ -576,7 +576,7 @@ public class XhpcHistoryOrder extends BaseEntity {
public Integer getStopReasonEvcs() {
return stopReasonEvcs;
return stopReasonEvcs == null ? 0 : stopReasonEvcs;
}
public void setStopReasonEvcs(Integer stopReasonEvcs) {
@ -604,9 +604,9 @@ public class XhpcHistoryOrder extends BaseEntity {
this.operatorId3rdptyEvcs = operatorId3rdptyEvcs;
}
public int getChargeModelEvcs() {
public Integer getChargeModelEvcs() {
return chargeModelEvcs;
return chargeModelEvcs == null ? 3 : chargeModelEvcs;
}
public void setChargeModelEvcs(int chargeModelEvcs) {
@ -616,7 +616,7 @@ public class XhpcHistoryOrder extends BaseEntity {
public Double getConnectorPowerEvcs() {
return connectorPowerEvcs;
return connectorPowerEvcs == null ? 0 : connectorPowerEvcs;
}
public void setConnectorPowerEvcs(Double connectorPowerEvcs) {