|
@@ -189,7 +189,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
|
|
|
Long computeTime = null;//计算耗时
|
|
|
JSONObject videosJson = null;
|
|
|
//如果mq生产者在消息体中执行了计算结果mq的主题名,就发到这个主题名,否则就发送到配置的主题名
|
|
|
- buildSceneResultTopic = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
|
|
|
+ String resultTopicName = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
|
|
|
message.getResultReceiverMqName() : buildSceneResultTopic;
|
|
|
//该场景使用的容量
|
|
|
Long space = 0L;
|
|
@@ -398,7 +398,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
|
|
|
// handFail("计算失败",message);
|
|
|
}finally {
|
|
|
//发送计算结果到mq,再由消费者消费并操作数据库
|
|
|
- this.sendCallResult(buildSuccess, cameraType, computeTime, fileId, payStatus, projectNum, space, videosJson);
|
|
|
+ this.sendCallResult(buildSuccess, resultTopicName, cameraType, computeTime, fileId, payStatus, projectNum, space, videosJson);
|
|
|
//上传status.json console.log
|
|
|
this.uploadStatusJsonAndConsoleLog(sceneProId, sceneStatus, webSite, projectNum, thumb, payStatus, dataPath, dataSource);
|
|
|
|
|
@@ -442,9 +442,9 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void sendCallResult(boolean buildSuccess, String cameraType, Long computeTime, String fileId,
|
|
|
+ private void sendCallResult(boolean buildSuccess, String resultTopicName, String cameraType, Long computeTime, String fileId,
|
|
|
Integer payStatus, String projectNum, Long space, JSONObject videosJson){
|
|
|
- rocketMQProducer.sendOneWay(buildSceneResultTopic,
|
|
|
+ rocketMQProducer.sendOneWay(resultTopicName,
|
|
|
BuildSceneResultMqMessage.builder()
|
|
|
.buildSuccess(buildSuccess)
|
|
|
.cameraType(cameraType)
|