diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 2d27a1877..1c0bc26f7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -810,23 +810,23 @@ public class OrderService { log.info("人工结算订单-end orderCode:{}", dto.getOrderCode()); // 异步推送第三方平台订单信息 -// CompletableFuture.runAsync(() -> { -// try { -// commonService.commonPushOrderInfo(orderBasicInfo); -// } catch (Exception e) { -// log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e); -// } -// }, thirdpartyTaskExecutor); + CompletableFuture.runAsync(() -> { + try { + commonService.commonPushOrderInfo(orderBasicInfo); + } catch (Exception e) { + log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e); + } + }, thirdpartyTaskExecutor); // TODO 测试mq // 向mq中发送实时数据消息,给第三方服务消费 - CompletableFuture.runAsync(() -> { - try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo ); - } catch (Exception e) { - log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e); - } - }, thirdpartyTaskExecutor); +// CompletableFuture.runAsync(() -> { +// try { +// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo ); +// } catch (Exception e) { +// log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e); +// } +// }, thirdpartyTaskExecutor); return true; } diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index bdc710f5d..502fa5834 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -8,17 +8,17 @@ spring: # redis 配置 redis: # 地址 -# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com - host: 106.14.94.149 + host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com +# host: 106.14.94.149 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 账号 -# username: jsowell - # 密码 -# password: js@160829 - password: js160829 + username: jsowell +# 密码 + password: js@160829 +# password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell -# password: js@160829 - url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_pre - password: Js@160829 + url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell + password: js@160829 +# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_pre +# password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java index e2cdd1c57..05182a143 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java @@ -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; } } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 9f1cc8f27..a1b9a5630 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -674,42 +674,42 @@ 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 { // 平台没有查到订单 orderBasicInfoService.saveAbnormalOrder(data); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index 56f0f65fe..597115a0c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -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; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java index b1108efed..0a9b30643 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java @@ -380,53 +380,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); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java index 124af3381..beb1be04d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java @@ -112,45 +112,45 @@ 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; // } -// try { -// // 启动结果回复 -// commonService.commonPushStartChargeResult(orderInfo); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// // 启动失败， 推送第三方订单信息 -// if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) { +// if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)){ +// // 启动失败， 推送第三方订单信息 // try { // Thread.sleep(500); -// commonService.commonPushOrderInfo(orderInfo); +// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo); // } catch (Exception e) { // log.error("统一推送第三方平台订单信息error, ", e); // } // } // }, executor); - 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; } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java index bdde705a5..8afd878b1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java @@ -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; }