mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
Merge branch 'dev'
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -18,6 +19,7 @@ import com.jsowell.common.util.YKCUtils;
|
||||
import com.jsowell.common.util.id.IdUtils;
|
||||
import com.jsowell.common.util.spring.SpringUtils;
|
||||
import com.jsowell.netty.factory.YKCOperateFactory;
|
||||
import com.jsowell.pile.domain.ChargeAlgorithmRecord;
|
||||
import com.jsowell.pile.domain.OrderBasicInfo;
|
||||
import com.jsowell.pile.domain.PileBasicInfo;
|
||||
import com.jsowell.pile.dto.SavePileMsgDTO;
|
||||
@@ -25,6 +27,7 @@ import com.jsowell.pile.service.*;
|
||||
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
|
||||
import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
|
||||
import com.jsowell.thirdparty.common.CommonService;
|
||||
import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService;
|
||||
import com.jsowell.thirdparty.platform.service.impl.ChargeAlgorithmService;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -56,6 +59,9 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
|
||||
// 引入第三方平台任务线程池
|
||||
private ThreadPoolTaskExecutor thirdpartyTaskExecutor = SpringUtils.getBean("thirdpartyTaskExecutor");
|
||||
|
||||
@Autowired
|
||||
private BatteryChargeReportService batteryChargeReportService;
|
||||
|
||||
@Override
|
||||
public void afterPropertiesSet() throws Exception {
|
||||
YKCOperateFactory.register(type, this);
|
||||
@@ -81,7 +87,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
|
||||
private PileBasicInfoService pileBasicInfoService;
|
||||
|
||||
@Autowired
|
||||
private ChargeAlgorithmService chargeAlgorithmService;
|
||||
private ChargeAlgorithmRecordService chargeAlgorithmRecordService;
|
||||
|
||||
@Autowired
|
||||
private PersonalChargingRecordService personalChargingRecordService;
|
||||
@@ -682,7 +688,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
|
||||
|
||||
OrderBasicInfo finalOrderBasicInfo = orderBasicInfo;
|
||||
|
||||
// // TODO 异步推送第三方平台订单信息
|
||||
// TODO 异步推送第三方平台订单信息
|
||||
CompletableFuture.runAsync(() -> {
|
||||
try {
|
||||
commonService.commonPushOrderInfo(finalOrderBasicInfo);
|
||||
@@ -700,24 +706,46 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
|
||||
}
|
||||
}, thirdpartyTaskExecutor);
|
||||
|
||||
// 异步推送充电订单算法平台
|
||||
// CompletableFuture.runAsync(() -> {
|
||||
// try {
|
||||
// String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
|
||||
// log.info("异步推送充电订单算法平台 result:{}", result);
|
||||
// } catch (Exception e) {
|
||||
// log.error("异步推送充电订单算法平台 error, ", e);
|
||||
// }
|
||||
// }, thirdpartyTaskExecutor);
|
||||
// TODO 异步推送充电订单算法平台
|
||||
// CompletableFuture.runAsync(() -> {
|
||||
// try {
|
||||
// // 1-web端
|
||||
// getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.ONE);
|
||||
// // 2-pdf端
|
||||
// getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.TWO);
|
||||
// }catch (Exception e) {
|
||||
// log.error("异步推送充电订单算法平台 error", e);
|
||||
// }
|
||||
// }, thirdpartyTaskExecutor);
|
||||
//
|
||||
//
|
||||
// CompletableFuture.runAsync(() -> {
|
||||
// try {
|
||||
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
|
||||
// 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 {
|
||||
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
|
||||
} catch (Exception e) {
|
||||
log.error("推送第三方平台订单信息error, ", e);
|
||||
}
|
||||
}, thirdpartyTaskExecutor);
|
||||
|
||||
} else {
|
||||
// 平台没有查到订单
|
||||
@@ -727,4 +755,28 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
|
||||
|
||||
}
|
||||
|
||||
private String getReportUrlByOrderCode(String orderCode, String reportType) {
|
||||
// 先根据订单号查询报告信息, 对比 taskId
|
||||
ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode);
|
||||
String taskId = "";
|
||||
if (record == null) {
|
||||
// 获取新的 taskId
|
||||
taskId = batteryChargeReportService.getTaskIdByOrderCode(orderCode);
|
||||
}else {
|
||||
if (StringUtils.isNotBlank(record.getTaskId())) {
|
||||
// 如果信息不为空,说明之前推送过该订单的数据,可直接使用该taskId taskId
|
||||
taskId = record.getTaskId();
|
||||
}
|
||||
}
|
||||
if (StringUtils.isBlank(taskId)) {
|
||||
log.info("推送充电订单算法平台 taskId 为空");
|
||||
}
|
||||
log.info("推送充电订单算法平台 taskId:{}", taskId);
|
||||
// 再根据 tasKId 获取链接
|
||||
String url = batteryChargeReportService.getUrlByTaskId(taskId, reportType);
|
||||
log.info("推送充电订单算法平台 result:{}", url);
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user