From 50d9090b3d282b928fe9b09a61f408cc2b278abe Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 30 一月 2023 17:55:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 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 35ff9bd..a8dcc75 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -60,8 +60,10 @@
public List<MetaEntity> insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
excelLoader(list, req);
+ loadData(list);
+ copyFiles(list);
- return dataLoader(list);
+ return insertMetas(list);
}
/**
@@ -76,6 +78,7 @@
mf.setCreateTime(createTime);
mf.setDepid(ue.getDepid());
mf.setPath(tempPath + File.separator + mf.getPath());
+ mf.setMsg(null);
File f = new File(mf.getPath());
if (!f.exists()) {
@@ -84,7 +87,7 @@
MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null != old) {
- mf.setMsg("鏂囦欢宸插叆搴�");
+ mf.setMsg("宸插叆搴�");
}
}
}
@@ -118,7 +121,6 @@
if (null != mf.getMsg()) {
continue;
}
-
if (StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName())) {
xlsList.add(mf);
}
@@ -201,19 +203,9 @@
/**
* 鍔犺浇鏁版嵁
*/
- private List<MetaEntity> dataLoader(List<MetaFileEntity> list) {
- loadData(list);
- copyFiles(list);
-
- return insertMetas(list);
- }
-
- /**
- * 鍔犺浇鏁版嵁
- */
private void loadData(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
- if (StringHelper.isEmpty(mf.getEntity())) {
+ if (null != mf.getMsg() || StringHelper.isEmpty(mf.getEntity())) {
continue;
}
if (StaticData.SHP.equals(mf.getExtName()) || StaticData.GDB.equals(mf.getExtName())) {
@@ -238,9 +230,15 @@
return;
}
+ File file = new File(mf.getPath());
+ if (!file.exists()) {
+ mf.setMsg("鏂囦欢涓㈠け");
+ return;
+ }
+
MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
- if (old != null) {
- mf.setMsg("鏂囦欢宸插叆搴�");
+ if (null != old) {
+ mf.setMsg("宸插叆搴�");
return;
}
@@ -340,10 +338,7 @@
MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null != old) {
- mf.setPath(old.getPath());
- mf.setTab(old.getTab());
- mf.setEntity(old.getLayer());
- mf.setRows(old.getRows());
+ mf.setMsg("宸插叆搴�");
file.delete();
return 0;
}
@@ -413,7 +408,7 @@
MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null != old) {
- mf.setPath(old.getPath());
+ mf.setMsg("宸插叆搴�");
FileHelper.deleteFiles(file);
return;
}
--
Gitblit v1.9.3