修改计算逻辑

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -4,10 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ModelingBuildStatus;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.ComputerUtil;
-import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.modeling.bean.BuildSceneResultBean;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.fdkankan.modeling.entity.BuildLog;
@@ -168,7 +165,7 @@ public class RabbitMqListener {
         //如果mq生产者在消息体中设置了结算结果mq队列名，就发到这个队列，否则就发送到默认队列
         String resultQueueName = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
                 message.getResultReceiverMqName() : queueModelingPost;
-        String path = message.getDataSource();
+        String path = message.getPath();
         String num = message.getSceneNum();
         //不同的相机不同的方法
         String cameraType = message.getCameraType();
@@ -257,7 +254,7 @@ public class RabbitMqListener {
         buildLog.setHostName(SysConstants.hostName);
         buildLog.setQueueName(queueModelingCall);
         buildLog.setSceneNum(message.getSceneNum());
-        buildLog.setDataSource(message.getDataSource());
+        buildLog.setDataSource(message.getPath());
         buildLog.setCreateTime(new Date());
         buildLog.setUpdateTime(new Date());
         buildLog.setBuildType(0);
@@ -285,14 +282,13 @@ public class RabbitMqListener {
         if(buildStatus.equals(ModelingBuildStatus.REPEAT)){
             return;
         }
-        rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),
-            BuildSceneResultMqMessage.builder()
+        BuildSceneResultMqMessage buildResult = BuildSceneResultMqMessage.builder()
                 .buildSuccess(buildStatus.equals(ModelingBuildStatus.SUCCESS))
-                .cameraType(buildSceneResult.getCameraType())
                 .computeTime(buildSceneResult.getDuration())
-                .sceneCode(message.getSceneNum())
                 .path(buildSceneResult.getPath())
-                .build());
+                .build();
+        buildResult.setBuildContext(message.getBuildContext());
+        rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),buildResult);
     }
 
     private void deleteCachesAndResult(String path){