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:40:58 +08:00
parent b632ec8538
commit 3a186cb915
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ public class NotificationStopChargeResultTask extends CoreDispatcher {
@Autowired @Autowired
private AuthSecretTokenRepository authSecretTokenRepository; private AuthSecretTokenRepository authSecretTokenRepository;
@Scheduled(fixedRate = 1000 * 5) @Scheduled(fixedRate = 1000 * 3)
public void run() throws Exception { public void run() throws Exception {
notifyService(); notifyService();
@ -47,40 +47,28 @@ public class NotificationStopChargeResultTask extends CoreDispatcher {
Collection<String> pushOrders = REDIS.keys("pushOrder:*"); Collection<String> pushOrders = REDIS.keys("pushOrder:*");
for (String pushOrderKey : pushOrders) { for (String pushOrderKey : pushOrders) {
Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent");
if (stopCommandSent == null) {
continue;
}
String orderNo = pushOrderKey.substring(10); String orderNo = pushOrderKey.substring(10);
Map<String, Object> cacheOrder = REDIS.getCacheMap("order:" + orderNo); String orderkey = "order:".concat(orderNo);
final Object stopResult = cacheOrder.get("stopResult"); CacheOrderData orderData = REDIS.getCacheMapValue(orderkey, "orderData");
if (stopResult == null) { if (orderData != null) {
continue; Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
} Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent");
String operatorId3rdpty = (String) pushOrder.get("operatorId3rdpty"); if (stopCommandSent != null && !stopCommandSent) {
AuthSecretToken authSecretTokenOut = String operatorId3rdpty = (String) pushOrder.get("operatorId3rdpty");
authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty, AuthSecretToken authSecretTokenOut =
SECRET_TOKEN_TYPE_OUT).orElse(null); authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty,
CommonRequest<ChargeResultRequest> commonRequest = new CommonRequest<>(); SECRET_TOKEN_TYPE_OUT).orElse(null);
ChargeResultRequest chargeResultRequest = new ChargeResultRequest(); CommonRequest<ChargeResultRequest> commonRequest = new CommonRequest<>();
if (stopCommandSent) { ChargeResultRequest chargeResultRequest = new ChargeResultRequest();
//获取内部的充电订单号 String internetSerialNumber = (String) pushOrder.get("internetSerialNumber");
//通过充电订单号，获取指定的订单 chargeResultRequest.setStartChargeSeq(internetSerialNumber);
//判断订单充电状态
//获取指定的订单的数据
CacheOrderData orderData = (CacheOrderData) cacheOrder.get("orderData");
String internetSerialNumber = (String) pushOrder.get("internetSerialNumber");
chargeResultRequest.setStartChargeSeq(internetSerialNumber);
if (orderData != null) {
//使用指定包装类封装数据 //使用指定包装类封装数据
chargeResultRequest.setConnectorID(orderData.getPileNo() + orderData.getGunId()); chargeResultRequest.setConnectorID(orderData.getPileNo() + orderData.getGunId());
int succStat = 0; int succStat = 0;
int failReason = 0; int failReason = 0;
chargeResultRequest.setStartChargeSeqStat(4); chargeResultRequest.setStartChargeSeqStat(4);
chargeResultRequest.setSuccStat(succStat); chargeResultRequest.setSuccStat(succStat);
chargeResultRequest.setFailReason(failReason); chargeResultRequest.setFailReason(3);
//将其转换为json //将其转换为json
String jsonData = JSONUtil.toJSONString(chargeResultRequest); String jsonData = JSONUtil.toJSONString(chargeResultRequest);
commonRequest.setData(jsonData); commonRequest.setData(jsonData);
@ -99,11 +87,5 @@ public class NotificationStopChargeResultTask extends CoreDispatcher {
} }
} }
} }
//推送充电订单信息
// new NotificationChargeOrderInfo().pushChargeOrderInfo();
//
// //进行账单对账
// new CheckChargeOrders().checkChargeOrder();
} }
} }