From af438cf2852b453e4a2a8742e4d395e0e008747b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 一月 2023 11:39:30 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 79a3524..f8bc39b 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -7,10 +7,7 @@
 import com.lf.server.entity.data.FmeLogEntity;
 import com.lf.server.entity.data.MetaFileEntity;
 import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.ClassHelper;
-import com.lf.server.helper.GdbHelper;
-import com.lf.server.helper.ShpHelper;
-import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.*;
 import com.lf.server.mapper.all.BasicMapper;
 import com.lf.server.mapper.data.UploadMapper;
 import com.lf.server.service.all.BaseQueryService;
@@ -20,6 +17,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -62,6 +60,27 @@
         checkMetaFiles(ue, list);
         dataLoader(list);
         excelLoader(list, req);
+    }
+
+    /**
+     * 妫�鏌ュ厓鏁版嵁鏂囦欢
+     */
+    private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
+        Timestamp createTime = WebHelper.getCurrentTimestamp();
+        String tempPath = pathHelper.getConfig().getTempPath();
+
+        for (MetaFileEntity mf : list) {
+            mf.setCreateUser(ue.getId());
+            mf.setCreatetime(createTime);
+            mf.setDepid(ue.getDepid());
+            mf.setPath(tempPath + File.separator + mf.getPath());
+
+            File f = new File(mf.getPath());
+            if (!f.exists()) {
+                mf.setRows(-1);
+                mf.setMsg("鏂囦欢涓嶅瓨鍦�");
+            }
+        }
     }
 
     /**
@@ -128,11 +147,11 @@
                 BaseEntity be = (BaseEntity) t;
                 be.setEventid(StringHelper.getGuid());
                 be.setParentid(mf.getEventid());
-                be.setCreateuser(mf.getCreateUser());
-                be.setCreatetime(mf.getCreatetime());
                 be.setDirid(mf.getDirid());
                 be.setDepid(mf.getDepid());
                 be.setVerid(mf.getVerid());
+                be.setCreateuser(mf.getCreateUser());
+                be.setCreatetime(mf.getCreatetime());
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -144,24 +163,6 @@
      */
     private void copyFiles(List<MetaFileEntity> list) {
 
-    }
-
-    /**
-     * 妫�鏌ュ厓鏁版嵁鏂囦欢
-     */
-    private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
-        String tempPath = pathHelper.getConfig().getTempPath();
-        for (MetaFileEntity mf : list) {
-            mf.setCreateUser(ue.getId());
-            mf.setDepid(ue.getDepid());
-            mf.setPath(tempPath + File.separator + mf.getPath());
-
-            File f = new File(mf.getPath());
-            if (!f.exists()) {
-                mf.setRows(-1);
-                mf.setMsg("鏂囦欢涓嶅瓨鍦�");
-            }
-        }
     }
 
     /**

--
Gitblit v1.9.3