断续拍摄场景 场景重算推送计算状态到全景看看

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

@@ -33,6 +33,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
@@ -456,9 +457,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         mqMessage.getExt().put("deleteExtras", true);
         if(jsonObject.getIntValue("location") == 7){
-            rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, mqMessage);
             //发送到全景看看进行初始化
             intermitSceneService.sendMq(scenePlusVO.getNum(), jsonObject, CommonSuccessStatus.WAITING.code());
+            rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, mqMessage);
         }else{
             rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
         }
@@ -1273,7 +1274,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 userName = user.getUserName();
             }
             Camera cameraEntity = cameraService.getById(scenePlus.getCameraId());
-            fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true);
+            if(Objects.isNull(scenePlusExt.getLocation()) || scenePlusExt.getLocation() != 7){
+                fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true);
+            }
             message = this.getBuildSceneMqMessage(
                     num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
                     fdageData, buildType, path);
@@ -1290,6 +1293,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         if(Objects.nonNull(scenePlusExt.getLocation()) && scenePlusExt.getLocation() == 7){
+            //发送到全景看看进行初始化
+            JSONObject jsonObject = JSONObject.parseObject(fYunFileService.getFileContent(SceneUtil.getHomePath(scenePlusExt.getDataSource()) + "data.fdage"));
+            intermitSceneService.sendMq(num, jsonObject, CommonSuccessStatus.WAITING.code());
             rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, message);
         }else{
             rabbitMqProducer.sendByWorkQueue(queueModelingPre, message);