From 88a5f5ef66fd9be3835f80cb81c8399b831da341 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 四月 2023 17:24:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 6fd4452..27829af 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -3,7 +3,6 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
-import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
@@ -70,7 +69,6 @@
excelLoader(list, req);
loadData(list);
copyFiles(list);
- publishFiles(list);
insertMetas(list);
}
@@ -103,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;
}
/**
@@ -129,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);
}
}
@@ -226,7 +221,7 @@
/**
* 鍔犺浇绌洪棿鏁版嵁
*/
- private void loadSpatialData(MetaFileEntity mf) {
+ public void loadSpatialData(MetaFileEntity mf) {
BasicMapper basicMapper = ClassHelper.getBasicMapper(mf.getEntity());
if (null == basicMapper) {
return;
@@ -472,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;
--
Gitblit v1.9.3