Merge branch 'release-swsx' into test

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

@@ -106,16 +106,13 @@ public class BuildSxRelocationServiceImpl implements IBuildSceneService {
             buildContext.put("sceneNum",message.getSceneNum());
             message.setBuildContext(buildContext);
 
-            ScenePlusExt scenePlusExtByPlusId = scenePlusExtService.getScenePlusExtByPlusId(scenePlusByNum.getId());
-            String dataFdageKey = SceneUtil.getHomePath(scenePlusExtByPlusId.getDataSource()) + "data.fdage";
-            JSONObject jsonObject = JSON.parseObject(fYunFileService.getFileContent(dataFdageKey));
-            if (!ObjectUtils.isEmpty(modelType)) {
-                // 修改dataFdage文件
-                jsonObject.put("modelType", modelType);
-            }
-            Map<String, String> dataMap = buildService.getTypeString(message.getCameraType(), message.getAlgorithm(), message.getResolution(),jsonObject);
+            Map<String, String> dataMap = new HashMap<>();
             dataMap.put("splitType", "SPLIT_V31");
-            buildService.writeDataJson(message, jsonObject, dataMap, null);
+            dataMap.put("skyboxType", "SKYBOX_V6");
+            if(ModelTypeEnums.TILE_CODE.equals(modelType)){
+                dataMap.put("skyboxType", "SKYBOX_V14");
+            }
+            buildService.writeDataJson(message, new JSONObject(), dataMap, null);
         }catch (Exception e){
             scenePlusByNum.setSceneStatus(SceneStatus.FAILD.code());
             scenePlusService.updateById(scenePlusByNum);
@@ -155,7 +152,7 @@ public class BuildSxRelocationServiceImpl implements IBuildSceneService {
     @Override
     public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
         String sceneCode = message.getBuildContext().get("sceneNum").toString();
-        Long batchId = (Long) message.getExt().get("batchId");
+        Long batchId = Long.valueOf(message.getExt().get("batchId").toString());
         String path = message.getPath();
         Map<String, Object> downParams = new HashMap<>();
         downParams.put("sceneCode", sceneCode);