1

13693261870

2023-03-25 70ddec6cf736c0174bafaef0a9bfe4c9412af133

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

@@ -69,7 +69,6 @@
        excelLoader(list, req);
        loadData(list);
        copyFiles(list);
        publishFiles(list);
        insertMetas(list);
    }

@@ -102,21 +101,18 @@
    /**
     * 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;
    }

    /**
@@ -128,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);
            }
        }
@@ -225,7 +221,7 @@
    /**
     * 加载空间数据
     */
    private void loadSpatialData(MetaFileEntity mf) {
    public void loadSpatialData(MetaFileEntity mf) {
        BasicMapper basicMapper = ClassHelper.getBasicMapper(mf.getEntity());
        if (null == basicMapper) {
            return;
@@ -471,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;