autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 第三方推送

Browse Source
This commit is contained in:
YAS\29473
2025-11-19 13:20:48 +08:00
parent d1c8827b4f
commit 59d6e69a26
8 changed files with 217 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java
View File

@@ -109,54 +109,54 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler {
orderBasicInfoService.chargingPileStartedSuccessfully(transactionCode);
}
// 异步推送第三方平台
CompletableFuture.runAsync(() -> {
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
if (orderInfo == null) {
return;
}
try {
// 启动结果回复
commonService.commonPushStartChargeResultV2(orderInfo);
} catch (Exception e) {
e.printStackTrace();
}
// 启动失败， 推送第三方订单信息
if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
try {
Thread.sleep(500);
commonService.commonPushOrderInfoV2(orderInfo);
} catch (Exception e) {
log.error("统一推送第三方平台订单信息error, ", e);
}
}
}, thirdpartyTaskExecutor);
// TODO 测试mq
// 异步发送mq
// CompletableFuture.runAsync(() -> {
// OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
// if (orderInfo == null) {
// return;
// }
// try {
// // 推送启动充电结果
// Thread.sleep(1000);
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_RESULT_PUSH, orderInfo);
// // 启动结果回复
// commonService.commonPushStartChargeResultV2(orderInfo);
// } catch (Exception e) {
// e.printStackTrace();
// }
// // 启动失败， 推送第三方订单信息
// if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
// try {
// Thread.sleep(1000);
// //充电订单信息推送,订单信息推送,停止充电结果推送,充电账单推送
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
// Thread.sleep(500);
// commonService.commonPushOrderInfoV2(orderInfo);
// } catch (Exception e) {
// log.error("统一推送第三方平台订单信息error, ", e);
// }
// }
// }, thirdpartyTaskExecutor);
// TODO 测试mq
// 异步发送mq
CompletableFuture.runAsync(() -> {
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
if (orderInfo == null) {
return;
}
try {
// 推送启动充电结果
Thread.sleep(1000);
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_RESULT_PUSH, orderInfo);
} catch (Exception e) {
e.printStackTrace();
}
// 启动失败， 推送第三方订单信息
if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
try {
Thread.sleep(1000);
//充电订单信息推送,订单信息推送,停止充电结果推送,充电账单推送
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
} catch (Exception e) {
log.error("统一推送第三方平台订单信息error, ", e);
}
}
}, thirdpartyTaskExecutor);
return null;
}
}

59
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.google.common.primitives.Bytes;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
@@ -683,41 +684,41 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
OrderBasicInfo finalOrderBasicInfo = orderBasicInfo;
// // TODO 异步推送第三方平台订单信息
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushOrderInfo(finalOrderBasicInfo);
} catch (Exception e) {
log.error("推送第三方平台订单信息error, ", e);
}
}, thirdpartyTaskExecutor);
// TODO 异步推送第三方平台订单信息V2
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushOrderInfoV2(finalOrderBasicInfo);
} catch (Exception e) {
log.error("推送第三方平台订单信息error, ", e);
}
}, thirdpartyTaskExecutor);
// 异步推送充电订单算法平台
// CompletableFuture.runAsync(() -> {
// try {
// String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
// log.info("异步推送充电订单算法平台 result:{}", result);
// } catch (Exception e) {
// log.error("异步推送充电订单算法平台 error, ", e);
// }
// }, thirdpartyTaskExecutor);
//
//
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
// commonService.commonPushOrderInfo(finalOrderBasicInfo);
// } catch (Exception e) {
// log.error("推送第三方平台订单信息error, ", e);
// }
// }, thirdpartyTaskExecutor);
//
// // TODO 异步推送第三方平台订单信息V2
// CompletableFuture.runAsync(() -> {
// try {
// commonService.commonPushOrderInfoV2(finalOrderBasicInfo);
// } catch (Exception e) {
// log.error("推送第三方平台订单信息error, ", e);
// }
// }, thirdpartyTaskExecutor);
// 异步推送充电订单算法平台
CompletableFuture.runAsync(() -> {
try {
String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
log.info("异步推送充电订单算法平台 result:{}", result);
} catch (Exception e) {
log.error("异步推送充电订单算法平台 error, ", e);
}
}, thirdpartyTaskExecutor);
CompletableFuture.runAsync(() -> {
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
} catch (Exception e) {
log.error("推送第三方平台订单信息error, ", e);
}
}, thirdpartyTaskExecutor);
} else {
// 平台没有查到订单

66
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java
View File

@@ -361,46 +361,46 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler {
}
// 异步推送第三方平台实时数据V2
CompletableFuture.runAsync(() -> {
try {
commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// log.info("统一推送第三方平台实时数据V2 success, pileSn:{}, connectorCode:{}, connectorStatus:{}, realTimeMonitorData:{}, transactionCode:{}", pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
} catch (Exception e) {
log.error("统一推送第三方平台实时数据V2 error, ", e);
}
}, thirdpartyTaskExecutor);
if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// 故障
// 异步推送第三方平台告警信息
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}, thirdpartyTaskExecutor);
}
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
// CompletableFuture.runAsync(() -> {
// try {
// log.info("向mq中发送实时数据消息供第三方服务消费, realTimeMonitorData:{}", realTimeMonitorData);
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
// } catch (Exception e){
// log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
// commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
//// log.info("统一推送第三方平台实时数据V2 success, pileSn:{}, connectorCode:{}, connectorStatus:{}, realTimeMonitorData:{}, transactionCode:{}", pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// } catch (Exception e) {
// log.error("统一推送第三方平台实时数据V2 error, ", e);
// }
// if (StringUtils.equals(connectorStatus,Constants.ONE)){
// // 故障
// // 异步推送第三方平台告警信息
// }, thirdpartyTaskExecutor);
//
// if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// // 故障
// // 异步推送第三方平台告警信息
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
// commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
// } catch (Exception e) {
// log.error("统一推送第三方平台告警信息 error, ", e);
// }
// }
// }, executor);
// }, thirdpartyTaskExecutor);
// }
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
CompletableFuture.runAsync(() -> {
try {
log.info("向mq中发送实时数据消息供第三方服务消费, realTimeMonitorData:{}", realTimeMonitorData);
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
} catch (Exception e){
log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
}
if (StringUtils.equals(connectorStatus,Constants.ONE)){
// 故障
// 异步推送第三方平台告警信息
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}
}, executor);
return null;

81
jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.google.common.primitives.Bytes;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants;
import com.jsowell.common.core.domain.ykc.LoginRequestData;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
@@ -387,53 +388,53 @@ public class PileRabbitListener {
}
// // 异步推送第三方平台实时数据
CompletableFuture.runAsync(() -> {
try {
commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
} catch (Exception e) {
log.error("统一推送第三方平台实时数据 error,", e);
}
}, thirdpartyTaskExecutor);
// 异步推送第三方平台实时数据V2
CompletableFuture.runAsync(() -> {
try {
commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
} catch (Exception e) {
log.error("统一推送第三方平台实时数据V2 error, ", e);
}
}, thirdpartyTaskExecutor);
if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// 故障
// 异步推送第三方平台告警信息
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}, thirdpartyTaskExecutor);
}
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
// } catch (Exception e){
// log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
// commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// } catch (Exception e) {
// log.error("统一推送第三方平台实时数据 error,", e);
// }
// if (StringUtils.equals(connectorStatus,Constants.ONE)){
// // 故障
// // 异步推送第三方平台告警信息
// }, thirdpartyTaskExecutor);
//
// // 异步推送第三方平台实时数据V2
// CompletableFuture.runAsync(() -> {
// try {
// commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// } catch (Exception e) {
// log.error("统一推送第三方平台实时数据V2 error, ", e);
// }
// }, thirdpartyTaskExecutor);
//
// if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// // 故障
// // 异步推送第三方平台告警信息
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
// commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
// } catch (Exception e) {
// log.error("统一推送第三方平台告警信息 error, ", e);
// }
// }
// }, executor);
// }, thirdpartyTaskExecutor);
// }
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
CompletableFuture.runAsync(() -> {
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
} catch (Exception e){
log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
}
if (StringUtils.equals(connectorStatus,Constants.ONE)){
// 故障
// 异步推送第三方平台告警信息
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}
}, executor);
}

52
jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java
View File

@@ -112,44 +112,44 @@ public class RemoteStartChargingStrategy implements AbstractYkcStrategy {
log.info("远程启动充电命令回复-交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果(00-失败, 01-成功):{}, 失败原因:{}", transactionCode, pileSn, connectorCode, startResult, failedReasonMsg);
// 异步推送第三方平台
CompletableFuture.runAsync(() -> {
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
if (orderInfo == null) {
return;
}
try {
// 启动结果回复
commonService.commonPushStartChargeResult(orderInfo);
} catch (Exception e) {
e.printStackTrace();
}
// 启动失败， 推送第三方订单信息
if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
try {
Thread.sleep(500);
commonService.commonPushOrderInfo(orderInfo);
} catch (Exception e) {
log.error("统一推送第三方平台订单信息error, ", e);
}
}
}, executor);
// Todo 待完善
// CompletableFuture.runAsync(() -> {
// OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
// if (orderInfo == null) {
// return;
// }
// if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)){
// // 启动失败， 推送第三方订单信息
// try {
// // 启动结果回复
// commonService.commonPushStartChargeResult(orderInfo);
//
// } catch (Exception e) {
// e.printStackTrace();
// }
// // 启动失败， 推送第三方订单信息
// if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
// try {
// Thread.sleep(500);
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
// commonService.commonPushOrderInfo(orderInfo);
// } catch (Exception e) {
// log.error("统一推送第三方平台订单信息error, ", e);
// }
// }
// }, executor);
// Todo 待完善
CompletableFuture.runAsync(() -> {
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
if (orderInfo == null) {
return;
}
if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)){
// 启动失败， 推送第三方订单信息
try {
Thread.sleep(500);
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
} catch (Exception e) {
log.error("统一推送第三方平台订单信息error, ", e);
}
}
}, executor);
return null;

80
jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java
View File

@@ -347,53 +347,53 @@ public class UploadRealTimeMonitorStrategy implements AbstractYkcStrategy {
}
// // 异步推送第三方平台实时数据
CompletableFuture.runAsync(() -> {
try {
commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
} catch (Exception e) {
log.error("统一推送第三方平台实时数据 error,", e);
}
}, executor);
// 异步推送第三方平台实时数据V2
CompletableFuture.runAsync(() -> {
try {
commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
} catch (Exception e) {
log.error("统一推送第三方平台实时数据V2 error, ", e);
}
}, executor);
if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// 故障
// 异步推送第三方平台告警信息
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}, executor);
}
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
// } catch (Exception e){
// log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
// commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// } catch (Exception e) {
// log.error("统一推送第三方平台实时数据 error,", e);
// }
// if (StringUtils.equals(connectorStatus,Constants.ONE)){
// // 故障
// // 异步推送第三方平台告警信息
// }, executor);
//
// // 异步推送第三方平台实时数据V2
// CompletableFuture.runAsync(() -> {
// try {
// commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
// } catch (Exception e) {
// log.error("统一推送第三方平台实时数据V2 error, ", e);
// }
// }, executor);
//
// if (StringUtils.equals(connectorStatus, Constants.ONE)) {
// // 故障
// // 异步推送第三方平台告警信息
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
// commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
// } catch (Exception e) {
// log.error("统一推送第三方平台告警信息 error, ", e);
// }
// }
// }, executor);
// }, executor);
// }
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
CompletableFuture.runAsync(() -> {
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
} catch (Exception e){
log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
}
if (StringUtils.equals(connectorStatus,Constants.ONE)){
// 故障
// 异步推送第三方平台告警信息
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
} catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e);
}
}
}, executor);
return null;
}