From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 38 insertions(+), 21 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 51ced2a..27829af 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;
@@ -70,12 +69,11 @@
         excelLoader(list, req);
         loadData(list);
         copyFiles(list);
-        publishFiles(list);
         insertMetas(list);
     }
 
     /**
-     * 妫�鏌ユ簮鏁版嵁鏂囦欢
+     * 妫�鏌ュ厓鏁版嵁鏂囦欢
      */
     private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
         Timestamp createTime = WebHelper.getCurrentTimestamp();
@@ -103,25 +101,22 @@
     /**
      * Excel鍏ュ簱
      */
-    private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
+    private void excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
         List<MetaFileEntity> xlsList = getExcelFiles(list);
         if (xlsList.isEmpty()) {
-            return "";
+            return;
         }
 
-        String guid = null;
         try {
             MetaFileEntity meta = getExcelMeta(xlsList);
-            guid = fmeService.excelLoader(meta, req);
+            String guid = fmeService.excelLoader(meta, req);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
-
-        return guid;
     }
 
     /**
-     * 鑾峰彇Excel婧愭暟鎹枃浠�
+     * 鑾峰彇Excel鍏冩暟鎹枃浠�
      */
     private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
         List<MetaFileEntity> xlsList = new ArrayList<>();
@@ -129,7 +124,7 @@
             if (null != mf.getMsg()) {
                 continue;
             }
-            if (StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName())) {
+            if (StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName()) || mf.getName().contains("WBS")) {
                 xlsList.add(mf);
             }
         }
@@ -138,7 +133,7 @@
     }
 
     /**
-     * 鑾峰彇Excel鐨勬簮鏁版嵁
+     * 鑾峰彇Excel鐨勫厓鏁版嵁
      */
     private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
         List<String> pathList = new ArrayList<>();
@@ -226,7 +221,7 @@
     /**
      * 鍔犺浇绌洪棿鏁版嵁
      */
-    private void loadSpatialData(MetaFileEntity mf) {
+    public void loadSpatialData(MetaFileEntity mf) {
         BasicMapper basicMapper = ClassHelper.getBasicMapper(mf.getEntity());
         if (null == basicMapper) {
             return;
@@ -472,10 +467,10 @@
             }
             switch (mf.getExtName()) {
                 case StaticData.MPT:
-                    linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getPublishMptPath());
+                    linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
                     break;
                 case StaticData.D3DML:
-                    linkFiles(mf, null, pathHelper.getConfig().getPublish3dmlPath());
+                    linkFiles(mf, null, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
                     break;
                 default:
                     break;
@@ -502,8 +497,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));
             }
         }
@@ -518,15 +513,16 @@
     }
 
     /**
-     * 鎻掑叆婧愭暟鎹�
+     * 鎻掑叆鍏冩暟鎹�
      */
     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 ? "鎴愬姛" : "澶辫触");
@@ -534,10 +530,11 @@
     }
 
     /**
-     * 鍒涘缓婧愭暟鎹�
+     * 鍒涘缓鍏冩暟鎹�
      */
-    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 +556,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