兼容国际瓦片图

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

@@ -25,9 +25,9 @@ import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.model.constants.ConstantFileName;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.enums.ModelTypeEnums;
 import com.fdkankan.model.utils.CreateHouseJsonUtil;
 import com.fdkankan.model.utils.CreateObjUtil;
-import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.push.config.PushMessageConfig;
 import com.fdkankan.push.utils.PushMsgUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
@@ -64,6 +64,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("${queue.modeling.modeling-call}")
     private String queueModelingCall;
 
+    @Value("${model.type}")
+    private String modelType;
+
     @Autowired
     private RabbitMqProducer mqProducer;
 
@@ -106,6 +109,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //下载资源到本地
             this.downLoadSource(message, message.getPath());
 
+            if (!ObjectUtils.isEmpty(modelType)) {
+                // 修改dataFdage文件
+                JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
+                fdageJson.put("modelType", modelType);
+                FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
+            }
+
             message.getBuildContext().put("cameraType",message.getCameraType());
 
             //发送mq，就进行计算
@@ -442,6 +452,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         statusJson.put("sceneNum", num);
         statusJson.put("thumb", scenePlusExt.getThumb());
         statusJson.put("payStatus", 1);
+        statusJson.put("sceneScheme", scenePlusExt.getSceneScheme());
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
 
         fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
@@ -658,6 +669,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         scenePlusExt.setVideos(videosJson);
         scenePlusExt.setIsObj(isObj ? 1 : 0);
 
+        if(ModelTypeEnums.TILE_CODE.equals(modelType)){
+            scenePlusExt.setSceneScheme(3);
+        }
+
         SceneSource sceneSource = SceneSource.get(scenePlus.getSceneSource());
         switch (sceneSource){
             case BM:

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

@@ -67,6 +67,9 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
     @Value("${queue.modeling.v3.modeling-post}")
     private String queueV3ModelingPost;
 
+    @Value("${model.scene.kind}")
+    private String modelSceneKind;
+
     @Autowired
     private RabbitMqProducer mqProducer;
 
@@ -101,6 +104,13 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
             //下载资源到本地
             this.downLoadSource(message, message.getPath());
 
+            if (!ObjectUtils.isEmpty(modelSceneKind)) {
+                // 修改dataFdage文件
+                JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
+                fdageJson.put("modelType", modelSceneKind);
+                FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
+            }
+
             message.getBuildContext().put("cameraType",message.getCameraType());
 
             message.setResultReceiverMqName(queueV3ModelingPost);