1

13693261870

2022-11-22 7d49019d2cca2c58fe0412e40afb64755d33cfa6

 src/main/java/com/lf/server/service/data/DataLoaderService.java

@@ -9,6 +9,7 @@
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;

@@ -73,7 +74,7 @@
        for (File f : files) {
            String fileName = FileHelper.getFileName(f.getPath());
            if (fileName.contains(XLS)) {
                list.add(new TabMapperEntity(fileName, "xls", fileName));
                list.add(new TabMapperEntity(fileName, "xls", null, fileName));
                continue;
            }
            if (fileName.contains(MDB)) {
@@ -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);
@@ -235,7 +236,8 @@
                    case "shp":
                    case "gdb":
                    case "mdb":
                        insertDb(me.getType(), temp + "_zip", mfe, tabs);
                        String zipPath = FileHelper.getPath(temp + File.separator + mf.getPath()) + "_zip";
                        insertDb(me.getType(), zipPath, mfe, tabs);
                        break;
                    default:
                        break;
@@ -446,16 +448,17 @@
                continue;
            }

            String filePath = StringEscapeUtils.escapeJava(root + File.separator + tab.getSubPath());
            List<?> list = null;
            switch (type) {
                case "shp":
                    list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
                    list = ShpHelper.readData(clazz, filePath);
                    break;
                case "gdb":
                    list = GdbHelper.readData(clazz, root + File.separator + tab.getSubPath());
                    list = GdbHelper.readData(clazz, filePath, tab.getTab());
                    break;
                case "mdb":
                    list = MdbHelper.readData(clazz, root + File.separator + tab.getSubPath());
                    list = MdbHelper.readData(clazz, filePath, tab.getTab());
                    break;
                default:
                    break;
@@ -466,9 +469,6 @@
            setCreateInfo(list, mfe);

            Integer rows = basicMapper.insertBatch(list);
            if (basicMapper instanceof GeomBaseMapper) {
                updateDbGeom((GeomBaseMapper) basicMapper, list);
            }

            tab.setRows(rows);
        }