Merge remote-tracking branch 'origin/feature-生成obj判断点位校准文件版本' into release

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

@@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -170,8 +171,25 @@ public class BuildObjServiceImpl implements IBuildSceneService {
         String ossResultPath = String.format(UploadFilePath.scene_result_data_path, message.getSceneNum());
         fYunFileService.downloadFileByCommand(path + "/caches/images/", ossResultPath + "caches/images/");
 
-        //下载点位校准文件
-        fYunFileService.downloadFileByCommand(path + "/extras/", ossResultPath + "extras/");
+        //下载点位校准文件，刘强版本大改，要求只有包含字段vision_edit_version且vision_edit_version的值是1.0时，才下载vision_edit.txt文件进行计算，其他情况不保留
+        //2025-04-01,刘强再次要求，vision_edit_version >= 1.0 可以下载vision_edit.txt进行计算
+        if(fYunFileService.fileExist(ossResultPath + "extras/" + "vision_edit.txt")){
+            String fileContent = fYunFileService.getFileContent(ossResultPath + "extras/" + "vision_edit.txt");
+            JSONObject jsonObject = JSON.parseObject(fileContent);
+            if(jsonObject.containsKey("vision_edit_version")){
+                BigDecimal visionEditVersion = jsonObject.getBigDecimal("vision_edit_version");
+                if(visionEditVersion.compareTo(new BigDecimal("1.0")) != -1){
+                    fYunFileService.downloadFile(ossResultPath + "extras/vision_edit.txt", path + "/extras/vision_edit.txt");
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        JSONObject o = new JSONObject();
+        o.put("vision_edit_version", "1.1");
+
+        System.out.println(o.getBigDecimal("vision_edit_version"));
     }
 
     @Override