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

优化停止充电推送

Browse Source
This commit is contained in:
ZZ 2021-11-22 13:54:05 +08:00
parent 3a186cb915
commit 3d5d0a8bd1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java
View File

@ -136,7 +136,7 @@ public class QueryStopChargeController {
//设置推送停止充电订单所需要的数据 //设置推送停止充电订单所需要的数据
Map<String, Object> pushOrder = REDIS.getCacheMap("pushOrder:".concat(xhOrderNo)); Map<String, Object> pushOrder = REDIS.getCacheMap("pushOrder:".concat(xhOrderNo));
pushOrder.put("stopCommandSent", true); pushOrder.put("stopCommandSent", false);
pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9)); pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9));
pushOrder.put("internetSerialNumber", startChargeSeq); pushOrder.put("internetSerialNumber", startChargeSeq);
REDIS.setCacheMap("pushOrder:".concat(xhOrderNo), pushOrder); REDIS.setCacheMap("pushOrder:".concat(xhOrderNo), pushOrder);

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CheckChargeOrders.java
View File

@ -47,7 +47,7 @@ public class CheckChargeOrders extends CoreDispatcher {
for (String pushOrderKey : pushOrders) { for (String pushOrderKey : pushOrders) {
Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey); Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent");
if (stopCommandSent == null) { if (stopCommandSent == null || !stopCommandSent) {
continue; continue;
} }
String orderNo = pushOrderKey.substring(10); String orderNo = pushOrderKey.substring(10);

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo.java
View File

@ -53,7 +53,7 @@ public class NotificationChargeOrderInfo extends CoreDispatcher {
for (String pushOrderKey : pushOrders) { for (String pushOrderKey : pushOrders) {
Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey); Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent");
if (stopCommandSent == null) { if (stopCommandSent == null || !stopCommandSent) {
continue; continue;
} }
String orderNo = pushOrderKey.substring(10); String orderNo = pushOrderKey.substring(10);

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
View File

@ -80,7 +80,7 @@ public class NotificationStopChargeResultTask extends CoreDispatcher {
//推送成功则排除这个已推送的订单，否则则继续推送该订单 //推送成功则排除这个已推送的订单，否则则继续推送该订单
//将stopCommandSent置为null，表示推送成功之后该订单都不进行推送 //将stopCommandSent置为null，表示推送成功之后该订单都不进行推送
if (succStat == 0) { if (succStat == 0) {
pushOrder.replace("stopCommandSent", null); pushOrder.replace("stopCommandSent", true);
REDIS.setCacheMap(pushOrderKey, pushOrder); REDIS.setCacheMap(pushOrderKey, pushOrder);
} }
} }