Merge remote-tracking branch 'origin/master'

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java

@@ -36,9 +36,9 @@ public class CacheOrderData extends BaseData {
     private String transactionDatetime; //交易日期、时间CP56Time2a格式
     private String stopReason; //停止原因
     private String cardNo; //物理卡号
-    private int startSoc;
+    private Integer startSoc;
-    private int endSoc;
+    private Integer endSoc;
-    private int status;//1自动结算，2异常
+    private Integer status;//1自动结算，2异常
 
     public String getOrderNo() {
 
@@ -350,32 +350,32 @@ public class CacheOrderData extends BaseData {
         this.cardNo = cardNo;
     }
 
-    public int getStartSoc() {
+    public Integer getStartSoc() {
 
         return startSoc;
     }
 
-    public void setStartSoc(int startSoc) {
+    public void setStartSoc(Integer startSoc) {
 
         this.startSoc = startSoc;
     }
 
-    public int getEndSoc() {
+    public Integer getEndSoc() {
 
         return endSoc;
     }
 
-    public void setEndSoc(int endSoc) {
+    public void setEndSoc(Integer endSoc) {
 
         this.endSoc = endSoc;
     }
 
-    public int getStatus() {
+    public Integer getStatus() {
 
         return status;
     }
 
-    public void setStatus(int status) {
+    public void setStatus(Integer status) {
 
         this.status = status;
     }

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java

@@ -178,7 +178,7 @@ public class ChargingController {
 
         String pileNo = refreshBalanceData.getPileNo();
         String gunkey = "gun:".concat(pileNo).concat(refreshBalanceData.getGunId());
-        if (CacheDataUtils.hori(gunkey)) return R.fail("等待上一条指令响应");
+        if (CacheDataUtils.hori(gunkey)) return R.fail("余额下发失败,请重试");
         String skey = gunkey.concat(".seqhex");
         String seq = seqHex(skey);
         String refreshBalanceMsg = "6817".concat(seq).concat("0042").concat(pileNo)
@@ -217,7 +217,7 @@ public class ChargingController {
             if (!"空闲".equals(gunstatus)) {
                 return R.fail("端口不在空闲或正常状态,稍后再试");
             }
-            if (CacheDataUtils.hori(gunkey)) return R.fail("等待上一条指令响应");
+            if (CacheDataUtils.hori(gunkey)) return R.fail("请检查终端号是否正确,稍后再试");
             String skey = gunkey.concat(".seqhex");
             String seq = seqHex(skey);
             byte[] msg = translateStart(startChargingData, seq);
@@ -230,7 +230,7 @@ public class ChargingController {
             Long pileRateModelId = (Long) cachePile.get("rateModelId");
             cacheOrder.put("rateModelId", pileRateModelId);
             cacheOrder.put("pileNo", pileNo);
-            cacheOrder.put("balance", balance * 100);
+            cacheOrder.put("initBalance", balance * 100);
             cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo());
             cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo());
             cacheOrder.put("gunId", startChargingData.getGunId());
@@ -260,7 +260,7 @@ public class ChargingController {
         }
         try {
             String gunkey = "gun:".concat(pileNo).concat(gunId);
-            if (CacheDataUtils.hori(gunkey)) return R.fail("等待上一条指令响应");
+            if (CacheDataUtils.hori(gunkey)) return R.fail("正在停止充电,如果失败请稍后再试一次");
             String skey = gunkey.concat(".seqhex");
             String seq = seqHex(skey);
             byte[] msg = translateStop(pileNo, gunId, version, seq);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java

@@ -42,7 +42,8 @@ public class OrderDataLogic implements ServiceLogic {
         String orderkey = "order:".concat(orderNo);
         Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
         CacheOrderData cacheOrderData = translate(orderData);
-        cacheOrderData.setStartSoc((Integer) cacheOrder.get("startSoc"));
+        Integer startSoc = (Integer) cacheOrder.get("startSoc");
+        cacheOrderData.setStartSoc(startSoc);
         cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc"));
         cacheOrderData.setStatus(1);
         cacheOrderData.setCreateTime(DateUtil.now());

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java

@@ -102,7 +102,7 @@ public class RealtimeDataLogic implements ServiceLogic {
                 realtimeDataList = new ArrayList<>();
             }
             StartChargingData startChargingData = new StartChargingData();
-            Integer balance = (Integer) cacheOrder.get("balance");
+            Integer balance = (Integer) cacheOrder.get("initBalance");
             CacheRealtimeData cacheRealtimeData = translate(realtimeData);
             balance -= cacheRealtimeData.getAmountCharged();
 //            startChargingData.setBalance(balance); //todo make pile work then uncomment
@@ -110,8 +110,8 @@ public class RealtimeDataLogic implements ServiceLogic {
 //            startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString());
 //            startChargingData.setPileNo(cacheOrder.get("pileNo").toString());
 //            startChargingData.setGunId(cacheOrder.get("gunId").toString());
-            Thread.sleep(300);
+//            Thread.sleep(300);
-//            chargingController.nativeRefreshBalance(startChargingData);
+//            chargingController.nativ-eRefreshBalance(startChargingData);
             cacheRealtimeData.setCreateTime(DateUtil.now());
             String lord = orderkey.concat(".lord");
             REDIS.setCacheObject(lord, cacheRealtimeData);
@@ -119,7 +119,7 @@ public class RealtimeDataLogic implements ServiceLogic {
             Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
             if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);
             if (socInt != 0) cacheOrder.put("endSoc", socInt);
-            cacheOrder.put("balance", balance);
+            cacheOrder.put("rbalance", balance);
             cacheOrder.put("remainingTime", tr);
             cacheOrder.put("status", statusplain);
             cacheOrder.put("realtimeDataList", realtimeDataList);