Browse Source

修改重新计算逻辑

tianboguang 2 years ago
parent
commit
6183910665

+ 1 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -70,7 +70,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             String path = message.getDataSource();
             String path = message.getDataSource();
             //获取解压后的资源的data.fdage中的数据
             //获取解压后的资源的data.fdage中的数据
             File folderPath = new File(path);
             File folderPath = new File(path);
-            CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage", path + "/capture/");
+            fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage", path + "/capture/");
             String data = FileUtils.readFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
             String data = FileUtils.readFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
             JSONObject jsonObject = JSONObject.parseObject(data);
             JSONObject jsonObject = JSONObject.parseObject(data);
             if(ObjectUtils.isEmpty(jsonObject)){
             if(ObjectUtils.isEmpty(jsonObject)){

+ 6 - 10
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1110,16 +1110,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //获取解压后的资源的data.fdage中的数据
         //获取解压后的资源的data.fdage中的数据
         File folderPath = new File(path);
         File folderPath = new File(path);
 
 
-        if (fyunType.equals(FYunTypeEnum.AWS.code())) {
-            fYunFileService.downloadFileByCommand(bucket, path + "/capture/",
-                ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, ""));
-        } else {
-            String dataFdageOssPath =
-                ConstantFilePath.OSS_PREFIX +
-                    path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
-                        .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
-            fYunFileService.downloadFileByCommand(bucket, path + "/capture/data.fdage", dataFdageOssPath);
-        }
+
+        String dataFdageOssPath = ConstantFilePath.OSS_PREFIX
+                + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
+                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
+        fYunFileService.downloadFileByCommand(bucket, path + "/capture", dataFdageOssPath);
+
         String data = FileUtils.readFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
         String data = FileUtils.readFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
         com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(data);
         com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(data);
         if(ObjectUtils.isEmpty(jsonObject)){
         if(ObjectUtils.isEmpty(jsonObject)){