From 07a68b8d93aa059968a9709f2c81e6625338032c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 20:19:49 +0800
Subject: [PATCH] 12

---
 src/main/java/com/lf/server/service/data/DataUploadService.java |   61 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/DataUploadService.java b/src/main/java/com/lf/server/service/data/DataUploadService.java
index 212954f..4e368c6 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -2,13 +2,12 @@
 
 import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.entity.sys.MenuEntity;
+import com.lf.server.helper.FileHelper;
 import com.lf.server.service.all.BaseUploadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -33,17 +32,19 @@
             String root = pathHelper.getUploadFullPath();
 
             for (MetaFileEntity mf : list) {
-                // 绉诲姩鏂囦欢
-                File file = new File(temp + File.separator + mf.getPath());
-                File newFile = new File(root + File.separator + mf.getName());
-                file.renameTo(newFile);
+                String filePath = getFilePath(temp, root, mf);
 
                 // 鍏冩暟鎹�
-                MetaEntity me=createMetaEntity(entity);
-                me.setName(mf.getName());
-                me.setSizes(mf.getSizes());
+                MetaEntity me = createMetaEntity(entity, mf);
+                if (metaService.insert(me) < 1) {
+                    continue;
+                }
 
                 // 鍏冩暟鎹枃浠�
+                MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
+                if (metaFileService.insert(mfe) > 0) {
+                    count++;
+                }
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -53,9 +54,31 @@
     }
 
     /**
+     * 鑾峰彇鏂囦欢璺緞
+     */
+    private String getFilePath(String temp, String root, MetaFileEntity mf) {
+        // 绉诲姩鏂囦欢
+        File file = new File(temp + File.separator + mf.getPath());
+        File newFile = new File(root + File.separator + mf.getGuid());
+
+        MetaFileEntity old = metaFileService.selectByGuid(mf.getGuid());
+
+        String filePath = null;
+        if (null == old) {
+            filePath = newFile.getPath();
+            file.renameTo(newFile);
+        } else {
+            filePath = old.getPath();
+            file.delete();
+        }
+
+        return filePath;
+    }
+
+    /**
      * 鍒涘缓鍏冩暟鎹疄浣�
      */
-    private MetaEntity createMetaEntity(MetaEntity entity) {
+    private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf) {
         MetaEntity me = new MetaEntity();
         me.setDepid(entity.getDepid());
         me.setDirid(entity.getDirid());
@@ -64,9 +87,27 @@
         me.setGather(entity.getGather());
         me.setBatch(entity.getBatch());
         me.setDescr(entity.getDescr());
+        me.setName(mf.getName());
+        me.setSizes(mf.getSizes());
         me.setCreateTime(entity.getCreateTime());
         me.setCreateUser(entity.getCreateUser());
 
         return me;
     }
+
+    /**
+     * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
+     */
+    private MetaFileEntity createMetaFileEntity(MetaEntity me, MetaFileEntity entity, String filePath) {
+        MetaFileEntity mfe = new MetaFileEntity();
+        mfe.setName(entity.getName());
+        mfe.setMetaid(me.getId());
+        mfe.setGuid(entity.getGuid());
+        mfe.setSizes(entity.getSizes());
+        mfe.setPath(FileHelper.getRelativePath(filePath));
+        mfe.setCreateUser(me.getCreateUser());
+        mfe.setCreateTime(me.getCreateTime());
+
+        return mfe;
+    }
 }

--
Gitblit v1.9.3