看见相机支持计算V3

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

@@ -534,6 +534,21 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
         }
 
+        ResultData ok = callV3(preParams, fdageJson,"api/scene/file/uploadSuccessBuild");
+        if (ok != null) return ok;
+
+        // 判断是否是V3的场景
+        ScenePro scenePro = sceneProService.getOne(
+                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, fileId));
+        if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
+            buildScene(fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
+        }else{
+            buildV3Scene(scenePro,fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
+        }
+        return ResultData.ok();
+    }
+
+    private ResultData callV3(String preParams, JSONObject fdageJson,String api) {
         String cameraName = fdageJson.getJSONObject("cam").getString("uuid");
 
         Camera camera = cameraService.getByChildName(cameraName);
@@ -556,23 +571,14 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 throw new BusinessException(CameraConstant.FAILURE_6003);
             }
             if (ObjectUtils.isEmpty(company.getSceneVersion()) && company.getSceneVersion().equals("V3")) {
-                callV3Service(preParams);
+                callV3Service(preParams,api);
                 return ResultData.ok();
             }
         }
-
-        // 判断是否是V3的场景
-        ScenePro scenePro = sceneProService.getOne(
-                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, fileId));
-        if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
-            buildScene(fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
-        }else{
-            buildV3Scene(scenePro,fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
-        }
-        return ResultData.ok();
+        return null;
     }
 
-    public void callV3Service(String params){
+    public void callV3Service(String params,String api){
         log.info("params:{}", params);
         if(ObjectUtils.isEmpty(v3controlUrl)){
             log.error("未配置V3服务器!");
@@ -583,7 +589,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         MultiValueMap<String,String> paramMap = new LinkedMultiValueMap();
         paramMap.add("params",params);
         HttpEntity<Object> formEntity = new HttpEntity<>(paramMap,headers);
-        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(v3controlUrl+"api/scene/file/uploadSuccessBuild", formEntity, Result.class);
+        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(v3controlUrl+api, formEntity, Result.class);
         if (responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()) {
             log.error("正顺场景请求V3服务器失败!");
             return;
@@ -594,6 +600,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Override
     public ResultData turntableUploadSuccess(String params) throws Exception {
         log.info("turntableUploadSuccess-params: " + params);
+        String preParams = params;
         if (StringUtils.isEmpty(params)) {
             throw new BusinessException(ErrorCode.PARAM_REQUIRED);
         }
@@ -641,6 +648,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             cameraType = 14L;
         }
 
+        ResultData ok = callV3(preParams, fdageJson,"api/scene/file/turntableUploadSuccess");
+        if (ok != null) return ok;
+
+
         ScenePlusVO scenePlusVO = null;
 
         // 判断是否是V3的场景