From 1a25c4d29b821714948134e2d0c5675bf7d27eb0 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Fri, 28 Jun 2024 16:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=88=A0=E9=99=A4txt=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetInformationForExcelServiceImpl.java    | 60 ++++++++++++-------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index fff164fd..a6a15072 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -107,6 +107,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                         }
                     }
                 }
+
             } catch (IOException | DirectoryIteratorException e) {
                 e.printStackTrace();
             }
@@ -142,12 +143,11 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
 
         //对图片保存
         if (CollectionUtils.isNotEmpty(imageFiles)) {
-
             String timestamp = String.valueOf(System.currentTimeMillis());
             List<String> list = new ArrayList<>();
             for (String imageFile : imageFiles) {
                 int index = 1;
-                list.add(excel.getBackupPhotoPath() + "\\" + index + timestamp + "$" + imageFile);
+                list.add(excel.getBackupPhotoPath() + File.separator + index + timestamp + "$" + imageFile);
                 index++;
             }
             //将图片改成复制后的名字路径
@@ -156,7 +156,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             for (String s : imageFiles) {
                 int index = 1;
                 // 创建源文件对象和目标文件夹对象
-                deleteBypath(excel.getFolderPath() + "\\" + s, excel.getBackupPhotoPath(), index + timestamp + "$" + s);
+                deleteBypath(excel.getFolderPath() + File.separator + s, excel.getBackupPhotoPath(), index + timestamp + "$" + s);
                 index++;
             }
         }
@@ -173,13 +173,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             String s = file.substring(dotIndex + 1);
 
             if (s.equals("csv") || s.equals("xls")) {
-                fileName.add(excel.getFolderPath() + "\\" + file);
+                fileName.add(excel.getFolderPath() + File.separator + file);
             }
             if (s.equals("tff")) {
-                tffName.add(excel.getFolderPath() + "\\" + file);
+                tffName.add(excel.getFolderPath() + File.separator + file);
             }
             if (s.equals("txt")) {
-                txtName.add(excel.getFolderPath() + "\\" + file);
+                txtName.add(excel.getFolderPath() + File.separator + file);
             }
         }
         //用一个统一的时间搓保证新增和复制删除的文件名是一样的
@@ -223,17 +223,18 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             for (String s : txtName) {
                 int index=1;
                 //找到\\的最后索引
-                int dotIndex = s.lastIndexOf("\\");
+                int dotIndex = s.lastIndexOf(File.separator);
                 String name = s.substring(dotIndex + 1);
                 deleteBypath(s, excel.getBackupFolderPath(), index + timestamp1 + "$" + name);
                 index++;
+
             }
         }
     }
 
     //新增完之后把原路径的文件复制到另一个文件并删除原路径的下的文件
     //endPath本地文件名 suffixName复制到文件夹路径
-    private static void deleteBypath(String endPath, String suffixName, String newFileName) {
+    private static void deleteBypath(String endPath, String suffixName, String newFileName) throws Exception{
         // 创建源文件对象和目标文件夹对象
         File sourceFile = new File(endPath);
 
@@ -245,7 +246,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             if (!destinationDir.exists()) {
                 destinationDir.mkdirs(); // 创建目标文件夹及其父目录
             }
-            // 构建目标文件路径
+            // 构建目标文件路径File.separator:"\\"
             String destinationPath = suffixName + File.separator + newFileName;
             File destinationFile = new File(destinationPath);
 
@@ -253,16 +254,18 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                 // 复制文件到目标文件夹
                 Files.copy(sourceFile.toPath(), destinationFile.toPath());
                 log.info("文件复制成功！" + sourceFile.toPath());
-
                 // 删除源文件
-                if (sourceFile.delete()) {
-                    log.info("源文件删除成功！" + sourceFile.toPath());
-                } else {
-                    log.info("源文件删除失败！" + sourceFile.toPath());
+                if (sourceFile.delete()){
+                    log.info("文件删除成功 ：" + sourceFile.toPath());
+                }else {
+                    log.info("文件删除失败 ：" + sourceFile.toPath());
                 }
-            } catch (IOException e) {
+
+            }catch (IOException e) {
                 log.info("文件操作出错：" + e.getMessage());
             }
+            //存在就删除
+
         }
     }
 
@@ -275,8 +278,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             int startLine = 15; // 第一次读取开始的行数
             int firstReadLines = 41;
             int columnInterval = 11;
-            try {
-                BufferedReader bufferedReader = new BufferedReader(new FileReader(s));
+            try (BufferedReader bufferedReader = new BufferedReader(new FileReader(s))){
                 String line;
                 List<String> list = new ArrayList<>();
                 // 第一次读取从第 15 行开始的 41 行数据
@@ -369,7 +371,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     index++;
                 }
                 equipmentDataDetails.get(equipmentDataDetails.size()-1).setFileValue1(file);
-                bufferedReader.close();
+
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -446,9 +448,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             String byName = name.substring(dotIndex + 1);
             String file =excel.getBackupFolderPath()+"\\"+num + timestamp1 + "$" + byName;
             num++;
-            try {
-
-                BufferedReader bufferedReader = new BufferedReader(new FileReader(name));
+            try (BufferedReader bufferedReader = new BufferedReader(new FileReader(name))){
                 String line;
                 List<String> list = new ArrayList<>();
                 for (int i = 1; i <= 19; i++) {
@@ -550,5 +550,23 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
         }
     }
 
+    public static void main(String[] args) {
+        String file="D:\\Data-acquisitio\\Equipment-data-acquisition\\Label01001\\20240628GEN205.txt";
+        File sourceFile = new File(file);
+        try{
+            boolean deleted = sourceFile.delete();
+            if (!deleted){
+                Thread.sleep(2000); // 等待2秒钟
+                deleted = sourceFile.delete(); // 再次尝试删除
+                if (!deleted){
+                    log.info("源文件再次删除失败！" + sourceFile.toPath());
+                }
+            } else {
+                log.info("源文件删除成功！" + sourceFile.toPath());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }