Browse Source

添加删除extras的配置

tianboguang 2 năm trước cách đây
mục cha
commit
c333b50b66

+ 4 - 3
src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -214,7 +214,7 @@ public class RabbitMqListener {
          1、判断是否计算过资源,若计算过删除缓存, 如果caches中存在_images文件或者目录,就删除掉,否则就删除除了images以外的所有文件和目录
          2、删除上一次计算出来的result目录
          */
-        this.deleteCachesAndResult(path);
+        this.deleteCachesAndResult(path,message);
 
         Map<String, String> dataMap = ComputerUtil.getTypeString(cameraType, algorithm, resolution,dataJson);
 
@@ -306,7 +306,7 @@ public class RabbitMqListener {
         rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),buildResult);
     }
 
-    private void deleteCachesAndResult(String path){
+    private void deleteCachesAndResult(String path,BuildSceneCallMessage message){
         //判断是否计算过资源,若计算过删除缓存, 如果caches中存在_images文件或者目录,就删除掉,否则就删除除了images以外的所有文件和目录
         File caches = new File(path + File.separator + "caches");
         if (caches.exists()) {
@@ -325,7 +325,8 @@ public class RabbitMqListener {
             FileUtils.delAllFile(path + File.separator + "results");
         }
         //删除点位数据
-        if (new File(path + File.separator + "extras").exists()) {
+        if (!ObjectUtils.isEmpty(message.getExt()) && message.getExt().containsKey("deleteExtras") && (Boolean) message.getExt().get("deleteExtras")
+                && new File(path + File.separator + "extras").exists()) {
             FileUtils.delAllFile(path + File.separator + "extras");
         }
     }