From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 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 3749d34..685703e 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -3,7 +3,6 @@
 import com.lf.server.entity.all.BaseEntity;
 import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.data.*;
-import com.lf.server.entity.sys.DepEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.*;
 import com.lf.server.mapper.all.BasicMapper;
@@ -226,7 +225,7 @@
     /**
      * 鍔犺浇绌洪棿鏁版嵁
      */
-    private void loadSpatialData(MetaFileEntity mf) {
+    public void loadSpatialData(MetaFileEntity mf) {
         BasicMapper basicMapper = ClassHelper.getBasicMapper(mf.getEntity());
         if (null == basicMapper) {
             return;
@@ -502,8 +501,8 @@
         }
 
         for (String ext : exts) {
-            File f=new File(source.replace(mf.getExtName(), ext));
-            if (f.exists()&&!f.isDirectory()) {
+            File f = new File(source.replace(mf.getExtName(), ext));
+            if (f.exists() && !f.isDirectory()) {
                 createFileLink(source.replace(mf.getExtName(), ext), target.replace(mf.getExtName(), ext));
             }
         }
@@ -521,12 +520,13 @@
      * 鎻掑叆鍏冩暟鎹�
      */
     private void insertMetas(List<MetaFileEntity> list) {
+        int metaId = insertParentMeta(list);
         for (MetaFileEntity mf : list) {
             if (null != mf.getMsg()) {
                 continue;
             }
 
-            MetaEntity me = createMeta(mf);
+            MetaEntity me = createMeta(mf, metaId);
             metaService.insert(me);
 
             mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
@@ -536,8 +536,9 @@
     /**
      * 鍒涘缓鍏冩暟鎹�
      */
-    private MetaEntity createMeta(MetaFileEntity mf) {
+    private MetaEntity createMeta(MetaFileEntity mf, int metaId) {
         MetaEntity me = new MetaEntity();
+        me.setMetaid(metaId);
         me.setEventid(mf.getEventid());
         me.setDircode(mf.getDircode());
         me.setDepcode(mf.getDepcode());
@@ -559,4 +560,24 @@
 
         return me;
     }
+
+    /**
+     * 鎻掑叆鐖跺厓鏁版嵁
+     */
+    private int insertParentMeta(List<MetaFileEntity> list) {
+        for (MetaFileEntity mf : list) {
+            if (null != mf.getMsg() || !mf.getIsMeta()) {
+                continue;
+            }
+
+            MetaEntity me = createMeta(mf, 0);
+            me.setIsmeta((short) 1);
+            metaService.insert(me);
+            mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+
+            return me.getId();
+        }
+
+        return 0;
+    }
 }

--
Gitblit v1.9.3