1

13693261870

2022-11-21 6997d659f4ad0b57b706d2764ae17d3cf0737fef

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

@@ -233,13 +233,9 @@
                        insertXls(root, mfe, tabs);
                        break;
                    case "shp":
                        insertShp(temp + "_zip", mfe, tabs);
                        break;
                    case "gdb":
                        insertGdb(temp + "_zip", mfe, tabs);
                        break;
                    case "mdb":
                        insertMdb(temp + "_zip", mfe, tabs);
                        insertDb(me.getType(), temp + "_zip", mfe, tabs);
                        break;
                    default:
                        break;
@@ -340,7 +336,7 @@
     */
    private void insertXls(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
        TabMapperEntity tab = getTabEntity(mfe, tabs);
        if (null == tab|| StringHelper.isEmpty(tab.getEntity())) {
        if (null == tab || StringHelper.isEmpty(tab.getEntity())) {
            return;
        }

@@ -356,7 +352,7 @@
        }

        List<?> list = ExcelHelper.readExcel(clazz, root + File.separator + mfe.getPath());
        if (null == list || list.isEmpty()) {
        if (list.isEmpty()) {
            return;
        }
        setCreateInfo(list, mfe);
@@ -366,8 +362,7 @@
            rows += basicMapper.insert(list.get(i));
        }
        if (basicMapper instanceof GeomBaseMapper) {
            GeomBaseMapper geomBaseMapper = (GeomBaseMapper) basicMapper;
            updateXlsGeom(geomBaseMapper, list);
            updateXlsGeom((GeomBaseMapper) basicMapper, list);
        }

        tab.setRows(rows);
@@ -432,9 +427,9 @@
    }

    /**
     * 插入SHP
     * 插入DB
     */
    private void insertShp(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {
    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;
@@ -451,7 +446,20 @@
                continue;
            }

            List<?> list = ShpHelper.readData(clazz, root + File.separator + tab.getSubPath());
            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());
                    break;
                case "mdb":
                    list = MdbHelper.readData(clazz, root + File.separator + tab.getSubPath());
                    break;
                default:
                    break;
            }
            if (null == list || list.isEmpty()) {
                continue;
            }
@@ -459,8 +467,7 @@

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

            tab.setRows(rows);
@@ -488,21 +495,5 @@
        } catch (Exception ex) {
            log.error(ex.getMessage(), ex);
        }
    }

    /**
     * 插入GDB
     */
    private Integer insertGdb(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {

        return 0;
    }

    /**
     * 插入MDB
     */
    private Integer insertMdb(String root, MetaFileEntity mfe, List<TabMapperEntity> tabs) {

        return 0;
    }
}