From f2c8c125a8584f9db37e65e8c65a67ec30a78d25 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Thu, 23 Sep 2021 18:36:37 +0800
Subject: [PATCH] enc.dec working; tbd: sig check, query station info logic

---
 .../evcs/domain/XhpcStatisticsTimeInterval.java  | 12 +++++++-----
 .../com/xhpc/order/domain/XhpcHistoryOrder.java  | 16 ++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/evcs/domain/XhpcStatisticsTimeInterval.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/evcs/domain/XhpcStatisticsTimeInterval.java
index bd992eeb..9377e4f2 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/evcs/domain/XhpcStatisticsTimeInterval.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/evcs/domain/XhpcStatisticsTimeInterval.java
@@ -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) {
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
index 390c6c1b..70b233f6 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
@@ -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) {