From a8a71926a69a90e1bd034cbd840378a4555a4887 Mon Sep 17 00:00:00 2001
From: yzj <2239426921@qq.com>
Date: Thu, 19 May 2022 00:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 ruoyi-admin/target/classes/application.yml    |  2 +-
 .../impl/ArchiveImportServiceImpl.java        | 34 +++++++++++++++++++
 ruoyi-archives/src/test/java/test3.java       |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a7990955..27c4a349 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -11,7 +11,7 @@ ruoyi:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   #profile: /opt/ruoyi/uploadPath
   profile: C:/Users/ThinkPad/Desktop/sql
-#  profile: /home/changhao/ruoyi/uploadPath
+  # 需要读取的文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   readPath: C:/Users/ThinkPad/Desktop/im1
   # 获取ip地址开关
   addressEnabled: false
diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml
index a7990955..27c4a349 100644
--- a/ruoyi-admin/target/classes/application.yml
+++ b/ruoyi-admin/target/classes/application.yml
@@ -11,7 +11,7 @@ ruoyi:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   #profile: /opt/ruoyi/uploadPath
   profile: C:/Users/ThinkPad/Desktop/sql
-#  profile: /home/changhao/ruoyi/uploadPath
+  # 需要读取的文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   readPath: C:/Users/ThinkPad/Desktop/im1
   # 获取ip地址开关
   addressEnabled: false
diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
index f8733988..a4ebea45 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
+++ b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
@@ -1467,7 +1467,14 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
         fos.close();
         fis.close();
     }
+    
 
+    /*
+     * @Description:批量上传文件
+     * @param stringArchiveRecordInfoMap 需要导入上传文件的数据
+     * @param byAction 根据ArchiveRecordInfo1的那个字段读取文件
+     * @Date: 2022/5/18 22:32
+     */
     public void uploadAllFiles(Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap,String byAction){
         //读取文件
         log.info("准备读取文件*********************************");
@@ -1487,6 +1494,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
         }
 
     }
+    /*
+     * @Description:单个上传
+     * @param fileUploadList 上传后保存的对象
+     * @param file 需要上传的文件
+     * @Date: 2022/5/18 22:33
+     */
     public void uploadFile(FileUploadList fileUploadList,File file){
          String dateUrl=fileUploadList.getPath();
          String finallyPath=ArchiveUploadConfig.getPath();
@@ -1507,6 +1520,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
                 e.printStackTrace();
         }
     }
+    /*
+     * @Description:获取从本地读取的文件信息 key：为字段名 value:为所对应的文件的路径
+     * @param
+     * @return: java.util.Map<java.lang.String,java.util.List<java.lang.String>>
+     * @Date: 2022/5/18 22:35
+     */
     public Map<String,List<String>> getFils(){
 //         Map<String, List<String>> fileMsg = redisTemplate.opsForValue().get(FILE_MSG);
 //        if (fileMsg==null){
@@ -1525,6 +1544,14 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
 //        return fileMsg;
         return fils;
     }
+    /*
+     * @Description:从本地读取文件并保存相关信息
+     * @param file 从那个路径开始读取 例如 /opt/doc/
+     * @param map 保存读取的文件信息
+     * @param index 记录读取文件的第几层
+     * @return: java.util.Map<java.lang.String,java.util.List<java.lang.String>>
+     * @Date: 2022/5/18 22:38
+     */
     public Map<String,List<String>> getFils(File file,Map<String,List<String>> map,int index){
         if (!file.isFile()){
             index++;
@@ -1561,6 +1588,13 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
         }
         return map;
     }
+
+    /*
+     * @Description:file 转换 MultipartFile
+     * @param file 需要转换的文件
+     * @return: org.springframework.web.multipart.commons.CommonsMultipartFile
+     * @Date: 2022/5/18 22:39
+     */
     public CommonsMultipartFile creat(File file) {
         DiskFileItemFactory factory = new DiskFileItemFactory(16, null);
         FileItem item = factory.createItem("textField", "text/plain", true, file.getName());
diff --git a/ruoyi-archives/src/test/java/test3.java b/ruoyi-archives/src/test/java/test3.java
index 21138f67..b36b06c6 100644
--- a/ruoyi-archives/src/test/java/test3.java
+++ b/ruoyi-archives/src/test/java/test3.java
@@ -25,8 +25,8 @@ public class test3 {
 
 
     }
-    public static Map<String, List<String>> getFils(File file, Map<String,List<String>> map,int index){
 
+    public static Map<String, List<String>> getFils(File file, Map<String,List<String>> map,int index){
         if (!file.isFile()){
             index++;
             System.out.printf("当前文件路径为{}"+file.getAbsolutePath()+"\n");