1

13693261870

2023-04-23 007da15aef3c8c4887bae335d1df7e4bd21e6995

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

@@ -66,11 +66,13 @@
     */
    public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
        checkMetaFiles(ue, list);
        excelLoader(list, req);
        MetaFileEntity xlsMeta = getExcelMetaEntity(list);
        loadData(list);
        copyFiles(list);
        publishFiles(list);
        insertMetas(list);
        if (null != xlsMeta) {
            excelLoader(xlsMeta, req);
        }
    }

    /**
@@ -94,26 +96,33 @@

            MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
            if (null != old) {
                mf.setMsg("已入库");
                mf.setMsg("已存在");
            }
        }
    }

    /**
     * Excel入库
     * 获取Excel元数据实体
     */
    private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
    private MetaFileEntity getExcelMetaEntity(List<MetaFileEntity> list) {
        List<MetaFileEntity> xlsList = getExcelFiles(list);
        if (xlsList.isEmpty()) {
            return "";
            return null;
        }

        String guid = null;
        return getExcelMeta(xlsList);
    }

    /**
     * Excel入库
     */
    private String excelLoader(MetaFileEntity xlsMeta, HttpServletRequest req) {
        String guid;
        try {
            MetaFileEntity meta = getExcelMeta(xlsList);
            guid = fmeService.excelLoader(meta, req);
            guid = fmeService.excelLoader(xlsMeta, req);
        } catch (Exception ex) {
            log.error(ex.getMessage(), ex);
            guid = null;
        }

        return guid;
@@ -128,7 +137,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);
            }
        }
@@ -246,7 +255,7 @@

        MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
        if (null != old) {
            mf.setMsg("已入库");
            mf.setMsg("已存在");
            return;
        }

@@ -307,6 +316,9 @@
                case StaticData.MPT:
                    copyMultiFile(mf, StaticData.MPT_EXT);
                    break;
                case StaticData.JPG:
                    copyMultiFile(mf, StaticData.JPG_EXT);
                    break;
                case StaticData.IMG:
                    copyMultiFile(mf, StaticData.IMG_EXT);
                    break;
@@ -350,7 +362,7 @@

        MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
        if (null != old) {
            mf.setMsg("已入库");
            mf.setMsg("已存在");
            file.delete();
            return 0;
        }
@@ -419,7 +431,7 @@

        MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
        if (null != old) {
            mf.setMsg("已入库");
            mf.setMsg("已存在");
            FileHelper.deleteFiles(file);
            return;
        }
@@ -462,7 +474,7 @@
    }

    /**
     * 发布文件
     * 发布文件 *
     */
    private void publishFiles(List<MetaFileEntity> list) {
        for (MetaFileEntity mf : list) {
@@ -471,10 +483,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;