Merge remote-tracking branch 'origin/master'

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/NewDataFittingService.java

@@ -26,10 +26,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -91,6 +93,7 @@ public class NewDataFittingService {
                 // 处理的数据保存在本地
                 String wtCode = InitialRunner.wtNewMap.get(wt).getId();
                 String fileName = config.getFilePathPrepare() + vo.getStation() + "_" + wtCode + "_" + System.currentTimeMillis() / 1000 + ".csv";
+                deleteDir(config.getFilePathPrepare());
                 boolean flag = FileUtil.writeFile(fileName, content);
 
                 if (flag){  // TODO  保存数据库
@@ -509,5 +512,24 @@ public class NewDataFittingService {
 
 
 
+    private boolean deleteDir(String path){
+         boolean  b  =false;
+        File directory = new File(path);
+        for (File file: Objects.requireNonNull(directory.listFiles())) {
+            if (!file.isDirectory()) {
+                b = file.delete();
+                if(!b){
+                    return b;
+                }
+            }
+        }
+        return b;
+
+    }
+
+
+
+
+
 }