重算接口 cameraType判断方式变更

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,7 +37,7 @@ public class SceneFileController{
     @Autowired
     private ISceneFileBuildService sceneFileBuildService;
 
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
 
     @Autowired

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

@@ -1217,7 +1217,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         //已删除原始资源的场景不支持重算
-        Long cameraId = null;
         Date laseCallTime = null;
         ScenePlusExt scenePlusExt = null;
         if(Objects.nonNull(scenePlus)){
@@ -1255,9 +1254,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
         }
         String path = scenePlusExt.getDataSource();
-        Integer sceneSource = scenePlus.getSceneSource();
         String buildType = scenePlusExt.getBuildType();
-        Integer sceneScheme = scenePlusExt.getSceneScheme();
 
         String dataFdageOssPath = ConstantFilePath.OSS_PREFIX+ path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
                 .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
@@ -1279,12 +1276,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         statusJson.put("status", SceneStatus.wait.code());
         fYunFileService.uploadFile(statusJson.toJSONString().getBytes(StandardCharsets.UTF_8),statusJsonOssPath);
 
-        Long cameraType = (long)sceneScheme == 3 ? 12 : (long)sceneScheme;
-        //判断是否转台相机
-        if(sceneSource == 3){
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+        Long cameraType = 10L;//默认看看
+        if(cameraDetail.getType() == 9){//看见
             cameraType = 13L;
         }
-        if(sceneSource == 4 || sceneSource == 5){
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){//深时、深光
             cameraType = 14L;
         }
         BuildSceneCallMessage message = null;