From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5

---
 src/main/java/com/lf/server/service/data/DataLoaderService.java |  308 +++++++++++++++++++++++---------------------------
 1 files changed, 143 insertions(+), 165 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 3f18951..92ce8e9 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -3,12 +3,12 @@
 import com.lf.server.entity.all.BaseEntity;
 import com.lf.server.entity.ctrl.TabMapperEntity;
 import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
 import com.lf.server.helper.*;
 import com.lf.server.mapper.all.BasicMapper;
 import com.lf.server.mapper.all.GeomBaseMapper;
 import com.lf.server.service.all.BaseQueryService;
 import com.lf.server.service.all.BaseUploadService;
+import org.apache.commons.text.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,9 +25,6 @@
 public class DataLoaderService extends BaseUploadService {
     @Autowired
     MetaService metaService;
-
-    @Autowired
-    MetaFileService metaFileService;
 
     private final static String XLS = ".xls";
 
@@ -69,17 +66,21 @@
      * 鑾峰彇鏄犲皠
      */
     private List<TabMapperEntity> getMappers(String zipPath, File[] files) {
+        String temp = pathHelper.getConfig().getTempPath();
+
         List<TabMapperEntity> list = new ArrayList<>();
         for (File f : files) {
             String fileName = FileHelper.getFileName(f.getPath());
             if (fileName.contains(XLS)) {
-                list.add(new TabMapperEntity(fileName, "xls", fileName));
+                String path = f.getPath().replace(temp + File.separator, "");
+                list.add(new TabMapperEntity(fileName, "xls", null, path));
                 continue;
             }
             if (fileName.contains(MDB)) {
+                String path = f.getPath().replace(temp + File.separator, "");
                 List<String> tabs = MdbHelper.getTabNames(f.getPath());
                 for (String tab : tabs) {
-                    list.add(new TabMapperEntity(fileName, "mdb", tab, fileName));
+                    list.add(new TabMapperEntity(fileName, "mdb", tab, path));
                 }
                 continue;
             }
@@ -95,8 +96,8 @@
                 getGdbFiles(f.getName(), subPath, list);
                 continue;
             }
-            if (!fileName.contains(ZIP)) {
-                //
+            if (fileName.contains(ZIP)) {
+                // 鏆傛椂涓嶅疄鐜�
             }
         }
 
@@ -110,7 +111,7 @@
         List<String> files = new ArrayList<>();
         getShpFiles(subPath, files);
 
-        String root = subPath.substring(0, subPath.lastIndexOf(File.separator) + 1);
+        String root = pathHelper.getConfig().getTempPath() + File.separator;
         for (String file : files) {
             String name = FileHelper.getFileName(file);
             String path = file.replace(root, "");
@@ -148,7 +149,7 @@
         List<String> files = new ArrayList<>();
         getGdbFiles(subPath, files);
 
-        String root = subPath.substring(0, subPath.lastIndexOf(File.separator) + 1);
+        String root = pathHelper.getConfig().getTempPath() + File.separator;
         for (String file : files) {
             String path = file.replace(root, "");
             List<String> tabs = GdbHelper.getTabNames(file);
@@ -203,42 +204,63 @@
     /**
      * 鎻掑叆鏂囦欢
      */
-    public void insertFiles(MetaEntity entity, List<MetaFileEntity> list, List<TabMapperEntity> tabs) {
+    public void insertFiles(MetaEntity entity, List<MetaEntity> list, List<TabMapperEntity> tabList) {
         try {
             String temp = pathHelper.getConfig().getTempPath();
-            String full = pathHelper.getUploadFullPath();
-            String root = pathHelper.getConfig().getUploadPath();
+            String upload = pathHelper.getUploadFullPath();
 
-            for (MetaFileEntity mf : list) {
-                String filePath = getFilePath(temp, full, mf);
-                if (null == filePath) {
+            for (MetaEntity mf : list) {
+                File file = new File(temp + File.separator + mf.getPath());
+                File newFile = new File(upload + File.separator + mf.getGuid());
+
+                String type = getType(mf.getName().toLowerCase());
+                if (null == type) {
+                    file.delete();
                     continue;
                 }
 
-                // 鍏冩暟鎹�
-                MetaEntity me = createMetaEntity(entity, mf);
-                if (metaService.insert(me) < 1) {
+                // 鑾峰彇琛ㄦ槧灏�
+                List<TabMapperEntity> tabs = getTabs(mf, tabList);
+                if (tabs.isEmpty()) {
+                    file.delete();
                     continue;
                 }
 
-                // 鍏冩暟鎹枃浠�
-                MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
-                if (metaFileService.insert(mfe) < 1) {
-                    continue;
+                MetaEntity old = metaService.selectByGuid(mf.getGuid());
+                String filePath = null == old ? newFile.getPath() : old.getPath();
+
+                int count = 0;
+                for (TabMapperEntity tab : tabs) {
+                    if (null == tab || StringHelper.isEmpty(tab.getEntity())) {
+                        return;
+                    }
+                    switch (type) {
+                        case "shp":
+                        case "gdb":
+                        case "mdb":
+                            insertDb(type, temp, entity, tab);
+                            break;
+                        // case "xls":
+                        default:
+                            insertXls(temp, entity, mf, tab);
+                            break;
+                    }
+                    if (0 == tab.getRows()) {
+                        continue;
+                    }
+
+                    MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows(), filePath);
+                    if (metaService.insert(me) == 0) {
+                        continue;
+                    }
+
+                    count += tab.getRows();
                 }
 
-                // 鍏ュ簱
-                switch (me.getType()) {
-                    case "xls":
-                        insertXls(root, mfe, tabs);
-                        break;
-                    case "shp":
-                    case "gdb":
-                    case "mdb":
-                        insertDb(me.getType(), temp + "_zip", mfe, tabs);
-                        break;
-                    default:
-                        break;
+                if (count == 0 || null != old) {
+                    file.delete();
+                } else {
+                    file.renameTo(newFile);
                 }
             }
         } catch (Exception ex) {
@@ -247,68 +269,19 @@
     }
 
     /**
-     * 鑾峰彇鏂囦欢璺緞
+     * 鑾峰彇 Tabs
      */
-    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());
+    private List<TabMapperEntity> getTabs(MetaEntity mfe, List<TabMapperEntity> tabs) {
+        List<TabMapperEntity> list = new ArrayList<>();
+        for (TabMapperEntity tab : tabs) {
+            if (!tab.getFileName().equals(mfe.getName()) || StringHelper.isEmpty(tab.getEntity())) {
+                continue;
+            }
 
-        // 鏂囦欢绫诲瀷
-        String metaType = getType(mf.getName().toLowerCase());
-        if (null == metaType) {
-            file.delete();
-            return null;
+            list.add(tab);
         }
 
-        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, MetaFileEntity mf) {
-        MetaEntity me = new MetaEntity();
-        me.setDepid(entity.getDepid());
-        me.setDirid(entity.getDirid());
-        me.setVerid(entity.getVerid());
-        me.setType(getType(mf.getName().toLowerCase()));
-        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;
+        return list;
     }
 
     /**
@@ -332,30 +305,49 @@
     }
 
     /**
+     * 鍒涘缓鍏冩暟鎹疄浣�
+     */
+    private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows, String filePath) {
+        MetaEntity me = new MetaEntity();
+        me.setEventid(StringHelper.getGuid());
+        me.setDirid(entity.getDirid());
+        me.setDepid(entity.getDepid());
+        me.setVerid(entity.getVerid());
+        me.setName(mf.getName());
+        me.setType(getType(mf.getName().toLowerCase()));
+        me.setGuid(entity.getGuid());
+        me.setPath(FileHelper.getRelativePath(filePath));
+        me.setSizes(mf.getSizes());
+        me.setBstab(tab);
+        me.setBsrows(rows);
+        // me.setMdtab()
+        me.setCreateTime(entity.getCreateTime());
+        me.setCreateUser(entity.getCreateUser());
+
+        return me;
+    }
+
+    /**
      * 鎻掑叆Excel
      */
-    private void insertXls(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
-        TabMapperEntity tab = getTabEntity(mfe, tabs);
-        if (null == tab || StringHelper.isEmpty(tab.getEntity())) {
-            return;
-        }
-
+    private void insertXls(String root, MetaEntity me, MetaEntity mf, TabMapperEntity tab) {
         BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
         if (null == basicMapper) {
             return;
         }
 
+        String tabName = BaseQueryService.getTabName(basicMapper);
         String className = ClassHelper.getClassName(basicMapper);
         Class clazz = ClassHelper.getEntityClass(className);
-        if (null == clazz) {
+        if (null == clazz || null == tabName) {
             return;
         }
 
-        List<?> list = ExcelHelper.readExcel(clazz, root + File.separator + mfe.getPath());
+        List<?> list = ExcelHelper.readExcel(clazz, root + File.separator + mf.getPath());
         if (list.isEmpty()) {
             return;
         }
-        setCreateInfo(list, mfe);
+        setCreateInfo(list, me);
 
         int rows = 0;
         for (int i = 0, c = list.size(); i < c; i++) {
@@ -365,35 +357,28 @@
             updateXlsGeom((GeomBaseMapper) basicMapper, list);
         }
 
+        tab.setTab(tabName);
         tab.setRows(rows);
-    }
-
-    /**
-     * 鑾峰彇琛ㄦ槧灏勫疄浣撶被
-     */
-    private TabMapperEntity getTabEntity(MetaFileEntity mfe, List<TabMapperEntity> tabs) {
-        for (TabMapperEntity tab : tabs) {
-            if (tab.getFileName().equals(mfe.getName())) {
-                return tab;
-            }
-        }
-
-        return null;
     }
 
     /**
      * 璁剧疆鍒涘缓淇℃伅
      */
-    private <T> void setCreateInfo(List<T> list, MetaFileEntity mfe) {
+    private <T> void setCreateInfo(List<T> list, MetaEntity me) {
         try {
-            for (T t : list) {
-                Field cuField = t.getClass().getDeclaredField("createuser");
-                cuField.setAccessible(true);
-                cuField.set(t, mfe.getCreateUser());
+            if (!(list.get(0) instanceof BaseEntity)) {
+                return;
+            }
 
-                Field ctField = t.getClass().getDeclaredField("createtime");
-                ctField.setAccessible(true);
-                ctField.set(t, mfe.getCreateTime());
+            for (T t : list) {
+                BaseEntity be = (BaseEntity) t;
+                be.setEventid(StringHelper.getGuid());
+                be.setParentid(me.getEventid());
+                be.setCreateuser(me.getCreateUser());
+                be.setCreatetime(me.getCreateTime());
+                be.setDirid(me.getDirid());
+                be.setDepid(me.getDepid());
+                be.setVerid(me.getVerid());
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
@@ -429,49 +414,42 @@
     /**
      * 鎻掑叆DB
      */
-    private void insertDb(String type, String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
-        for (TabMapperEntity tab : tabs) {
-            if (!tab.getFileName().equals(mfe.getName()) || StringHelper.isEmpty(tab.getEntity())) {
-                continue;
-            }
-
-            BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
-            if (null == basicMapper) {
-                continue;
-            }
-
-            String className = ClassHelper.getClassName(basicMapper);
-            Class clazz = ClassHelper.getEntityClass(className);
-            if (null == clazz) {
-                continue;
-            }
-
-            List<?> list = null;
-            switch (type) {
-                case "shp":
-                    list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
-                    break;
-                case "gdb":
-                    list = GdbHelper.readData(clazz, root + File.separator + tab.getSubPath(), tab.getTab());
-                    break;
-                case "mdb":
-                    list = MdbHelper.readData(clazz, root + File.separator + tab.getSubPath(), tab.getTab());
-                    break;
-                default:
-                    break;
-            }
-            if (null == list || list.isEmpty()) {
-                continue;
-            }
-            setCreateInfo(list, mfe);
-
-            Integer rows = basicMapper.insertBatch(list);
-            if (basicMapper instanceof GeomBaseMapper) {
-                updateDbGeom((GeomBaseMapper) basicMapper, list);
-            }
-
-            tab.setRows(rows);
+    private void insertDb(String type, String root, MetaEntity me, TabMapperEntity tab) {
+        BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
+        if (null == basicMapper) {
+            return;
         }
+
+        String tabName = BaseQueryService.getTabName(basicMapper);
+        String className = ClassHelper.getClassName(basicMapper);
+        Class clazz = ClassHelper.getEntityClass(className);
+        if (null == clazz || null == tabName) {
+            return;
+        }
+
+        String filePath = StringEscapeUtils.escapeJava(root + File.separator + tab.getSubPath());
+        List<?> list = null;
+        switch (type) {
+            case "shp":
+                list = ShpHelper.readData(clazz, filePath);
+                break;
+            case "gdb":
+                list = GdbHelper.readData(clazz, filePath, tab.getTab());
+                break;
+            case "mdb":
+                list = MdbHelper.readData(clazz, filePath, tab.getTab());
+                break;
+            default:
+                break;
+        }
+        if (null == list || list.isEmpty()) {
+            return;
+        }
+        setCreateInfo(list, me);
+
+        int rows = basicMapper.insertBatch(list);
+        tab.setTab(tabName);
+        tab.setRows(rows);
     }
 
     /**

--
Gitblit v1.9.3