From 43f760eb9dff0d983d58dc801772877f9cb1865f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 05 一月 2023 18:16:33 +0800
Subject: [PATCH] 1.5.3

---
 src/main/java/com/lf/server/service/data/DataUploadService.java |   30 +++++-------------------------
 1 files changed, 5 insertions(+), 25 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 4db0fa7..6fab4f5 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -31,14 +31,8 @@
                 String filePath = getFilePath(temp, root, mf);
 
                 // 鍏冩暟鎹�
-                MetaEntity me = createMetaEntity(entity, mf);
-                if (metaService.insert(me) < 1) {
-                    continue;
-                }
-
-                // 鍏冩暟鎹枃浠�
-                MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
-                if (metaService.insert(mfe) > 0) {
+                MetaEntity me = createMetaEntity(entity, mf, filePath);
+                if (metaService.insert(me) > 0) {
                     count++;
                 }
             }
@@ -74,33 +68,19 @@
     /**
      * 鍒涘缓鍏冩暟鎹疄浣�
      */
-    private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf) {
+    private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String filePath) {
         MetaEntity me = new MetaEntity();
         me.setDepid(entity.getDepid());
         me.setDirid(entity.getDirid());
         me.setVerid(entity.getVerid());
         me.setType("file");
+        me.setGuid(entity.getGuid());
+        me.setPath(FileHelper.getRelativePath(filePath));
         me.setName(mf.getName());
         me.setSizes(mf.getSizes());
         me.setCreateTime(entity.getCreateTime());
         me.setCreateUser(entity.getCreateUser());
 
         return me;
-    }
-
-    /**
-     * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
-     */
-    private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
-        MetaEntity mfe = new MetaEntity();
-        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