From 869572c8da2270e3a9f66d6221cdcc25fbc3aa20 Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 6 Sep 2021 17:43:56 +0800 Subject: [PATCH 1/5] cannot unbox null --- .../xhpc/common/data/redis/CacheOrderData.java | 18 +++++++++--------- .../java/com/xhpc/pp/logic/OrderDataLogic.java | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java index b8ba1374..e0323f06 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java +++ b/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 int endSoc; - private int status;//1自动结算，2异常 + private Integer startSoc; + private Integer endSoc; + 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; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 1bd799d4..ebbde6b1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/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 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()); From 62b3381288c8b7e42fe3beaeadced0808cae35c3 Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 6 Sep 2021 18:22:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E4=B8=8E=E5=8F=8B=E5=A5=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/controller/ChargingController.java | 2 +- .../java/com/xhpc/pp/logic/RealtimeDataLogic.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 915cf580..bd8aae44 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 56438e1d..e43e588c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -105,13 +105,13 @@ public class RealtimeDataLogic implements ServiceLogic { Integer balance = (Integer) cacheOrder.get("balance"); CacheRealtimeData cacheRealtimeData = translate(realtimeData); balance -= cacheRealtimeData.getAmountCharged(); -// startChargingData.setBalance(balance); //todo make pile work then uncomment -// startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); -// startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); -// startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); -// startChargingData.setGunId(cacheOrder.get("gunId").toString()); + startChargingData.setBalance(balance); //todo make pile work then uncomment + startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); + startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); + startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); + startChargingData.setGunId(cacheOrder.get("gunId").toString()); Thread.sleep(300); -// chargingController.nativeRefreshBalance(startChargingData); + chargingController.nativeRefreshBalance(startChargingData); cacheRealtimeData.setCreateTime(DateUtil.now()); String lord = orderkey.concat(".lord"); REDIS.setCacheObject(lord, cacheRealtimeData); From 47c09144454adfc5f5c8877c18e8556ee2c94ca3 Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 6 Sep 2021 18:25:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=8B=E5=A5=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xhpc/pp/controller/ChargingController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index bd8aae44..03ef54cf 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/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) @@ -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); From 654cf7b9e8ea027a0a13f366993d169c6306a29e Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 6 Sep 2021 18:40:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=88=E4=B8=8D=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/pp/logic/RealtimeDataLogic.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index e43e588c..2a6a0142 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -105,13 +105,13 @@ public class RealtimeDataLogic implements ServiceLogic { Integer balance = (Integer) cacheOrder.get("balance"); CacheRealtimeData cacheRealtimeData = translate(realtimeData); balance -= cacheRealtimeData.getAmountCharged(); - startChargingData.setBalance(balance); //todo make pile work then uncomment - startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); - startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); - startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); - startChargingData.setGunId(cacheOrder.get("gunId").toString()); - Thread.sleep(300); - chargingController.nativeRefreshBalance(startChargingData); +// startChargingData.setBalance(balance); //todo make pile work then uncomment +// startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); +// startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); +// startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); +// startChargingData.setGunId(cacheOrder.get("gunId").toString()); +// Thread.sleep(300); +// chargingController.nativeRefreshBalance(startChargingData); cacheRealtimeData.setCreateTime(DateUtil.now()); String lord = orderkey.concat(".lord"); REDIS.setCacheObject(lord, cacheRealtimeData); From 6ddd75f22001324b6e2974cee1ee386886b6780c Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 7 Sep 2021 06:11:38 +0800 Subject: [PATCH 5/5] new balance --- .../java/com/xhpc/pp/controller/ChargingController.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 03ef54cf..24317056 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -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()); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 2a6a0142..fb880ed8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/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 @@ -111,7 +111,7 @@ public class RealtimeDataLogic implements ServiceLogic { // startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); // startChargingData.setGunId(cacheOrder.get("gunId").toString()); // 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);