Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/listener/UploadShootingListener.java

@@ -47,7 +47,7 @@ public class UploadShootingListener {
         String num = params.getString("sceneCode");
         String batchId = params.getString("batchId");
         Integer index = params.getInteger("index");
-        Integer uuid = params.getInteger("uuid");
+        String uuid = params.getString("uuid");
         try {
             List<OrigFileUpload> fileUploadList = origFileUploadService.getByBatchId(batchId);
             String path = ConstantFilePath.BUILD_MODEL_PATH + "upload_while_shooting/" + uuid + "/" + index + "/";
@@ -56,7 +56,7 @@ public class UploadShootingListener {
                 HttpUtilExt.downloadFileAndCheck(origFileUpload.getFileUrl(), localPath, 300000);
             }
             params.put("path", path);
-            mqProducer.sendByWorkQueue(" laser-preview-scene-handler", params);
+            mqProducer.sendByWorkQueue("laser-preview-scene-handler", params);
         }catch (Exception e){
             log.error("场景预览文件处理出错, num:{}", num, e);
         }finally {

src/main/java/com/fdkankan/contro/service/impl/UploadShootingServiceImpl.java

@@ -197,6 +197,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
             sceneNum = scene3dNumService.generateSceneNum(camType);
             scenePlus = new ScenePlus();
             scenePlusExt = new ScenePlusExt();
+            scenePlusExt.setDataSource(dataSource);
             scenePlus.setNum(sceneNum);
             scenePlus.setSceneSource(SceneSource.BM.code());
             if (camType == CameraTypeEnum.DOUBLE_EYE_TURN.getType()) {
@@ -243,6 +244,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
         preParams.put("batchId", origFileUploadBatch.getBatchId());
         preParams.put("sceneCode", sceneNum);
         preParams.put("index", detail.getIndex());
+        preParams.put("uuid", detail.getUuid());
         mqProducer.sendByWorkQueue("preview-scene-pre", preParams);
     }