Merge branch 'feature-v4.10.0-20230714-dsx' into test

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

@@ -145,6 +145,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             if(new File(message.getPath() + File.separator + "results").exists()){
                 FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
             }
+            //由于刘强说caches会影响计算结果,所以这里删除caches
+            if(new File(message.getPath() + File.separator + "caches").exists()){
+                FileUtils.deleteDirectory(message.getPath() + File.separator + "caches");
+            }
 
             //删除点位校准数据
             if (Objects.nonNull(message.getExt())

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

@@ -121,9 +121,12 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         try {
 
             //重新计算时需要删除文件夹，否知使用缓存
-            //由于刘强说caches会影响计算结果,所以这里删除整个计算目录
-            if(new File(message.getPath()).exists()){
-                FileUtils.deleteDirectory(message.getPath());
+            if(new File(message.getPath() + File.separator + "results").exists()){
+                FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
+            }
+            //由于刘强说caches会影响计算结果,所以这里删除caches
+            if(new File(message.getPath() + File.separator + "caches").exists()){
+                FileUtils.deleteDirectory(message.getPath() + File.separator + "caches");
             }
 
             //用户相机重新全量上传，需要解冻结