1

13693261870

2023-04-18 92fb8de80f917af289237568e1782cf03a18bc7c

 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);
    }

@@ -94,7 +93,7 @@

            MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
            if (null != old) {
                mf.setMsg("已入库");
                mf.setMsg("已存在");
            }
        }
    }
@@ -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);
            }
        }
@@ -246,7 +242,7 @@

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

@@ -307,6 +303,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 +349,7 @@

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

        MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
        if (null != old) {
            mf.setMsg("已入库");
            mf.setMsg("已存在");
            FileHelper.deleteFiles(file);
            return;
        }
@@ -471,10 +470,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;