Browse Source

Merge branch 'hotfix-关闭升级功能-20230731-dsx' into release

dsx 2 years ago
parent
commit
3be86a68ad

+ 14 - 0
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -636,6 +636,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
         }
 
+        this.removeUpdateV4(ConstantFilePath.OSS_PREFIX + prefixBuffer + "data.fdage", fdageJson);
+
         // 判断是否是V3的场景
         ScenePro scenePro = sceneProService.getOne(
             new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, fileId));
@@ -652,6 +654,15 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return ResultData.ok();
     }
 
+    private void removeUpdateV4(String dataFdagePath, JSONObject fdageJson){
+        Integer updateV4 = fdageJson.getInteger("updateV4");
+        if(Objects.isNull(updateV4) || updateV4 == 0){
+            return;
+        }
+        fdageJson.put("updateV4", CommonStatus.NO.code());
+        fYunFileService.uploadFile(fdageJson.toJSONString().getBytes(StandardCharsets.UTF_8), dataFdagePath);
+    }
+
     private boolean callV3(ScenePro scenePro, String preParams, JSONObject fdageJson,String api) throws Exception {
 
         //复制出来的场景不支持补拍上传
@@ -764,6 +775,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             log.info("data.fdage文件为空");
             throw new BusinessException(CameraConstant.FAILURE_6009);
         }
+
+        this.removeUpdateV4(ConstantFilePath.OSS_PREFIX + prefixBuffer + "data.fdage", fdageJson);
+
         String buildType = "V3";
         //13表示转台
         Long cameraType = 13L;