Merge branch 'release-swsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSxTestServiceImpl.java

@@ -120,7 +120,7 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
                 relocationMaxindex = -1;
             }
             String extrasPath = message.getPath() + "/extras/";
-            fYunFileService.downloadFileByCommand(extrasPath, String.format(UploadFilePath.scene_result_data_path, num) + "pose");
+            fYunFileService.downloadFileByCommand(extrasPath, String.format(UploadFilePath.scene_result_data_path, num) + "pose/");
             List<String> imgKeyList = fYunFileService.listRemoteFiles(String.format(UploadFilePath.IMG_VIEW_PATH, qjkkNum) + "panoramas/");
             JSONObject query = new JSONObject();
             JSONArray queryList = new JSONArray();
@@ -139,10 +139,9 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
             //发送mq，就进行计算
             message.setResultReceiverMqName(queueModelingPost);
 
-            JSONObject fdageData = commonService.getFdageData(message.getPath() + File.separator + "capture" + File.separator + "data.fdage");
-            Map<String, String> dataMap = buildService.getTypeString(message.getCameraType(), message.getAlgorithm(), message.getResolution(), fdageData);
+            Map<String, String> dataMap = buildService.getTypeString(message.getCameraType(), message.getAlgorithm(), message.getResolution(), new JSONObject());
             dataMap.put("splitType", "SPLIT_V31");
-            buildService.writeDataJson(message, fdageData, dataMap, null);
+            buildService.writeDataJson(message, null, dataMap, null);
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
 
         }catch (Exception e){

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

@@ -400,6 +400,7 @@ public class InnerServiceImpl implements IInnerService {
         buildSceneCallMessage.setBizType("relocation");
         buildSceneCallMessage.setExt(params);
         buildSceneCallMessage.setPath(scenePlusExtByPlusId.getDataSource() + "_relocation");
+        buildSceneCallMessage.setCameraType("14");
         mqProducer.sendByWorkQueue("modeling-sx-pre", buildSceneCallMessage);
 
         sxScene.setSceneStatus(SceneStatus.wait.code());