From 5107fe96747cc93c33c7498e50e958ecbee9ad7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 23 一月 2023 09:27:52 +0800
Subject: [PATCH] 1.23
---
src/main/java/com/lf/server/service/data/UploadService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 0084642..4cefa18 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -125,7 +125,16 @@
return;
}
- List<?> list = null;
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
+ if (old != null) {
+ mf.setPath(old.getPath());
+ mf.setEntity(old.getLayer());
+ mf.setTab(old.getTab());
+ mf.setRows(old.getRows());
+ return;
+ }
+
+ List<?> list;
if (StaticData.SHP.equals(mf.getExtName())) {
list = ShpHelper.readData(clazz, mf.getPath());
} else {
@@ -219,7 +228,7 @@
return -1;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null != old) {
mf.setPath(old.getPath());
mf.setTab(old.getTab());
@@ -292,12 +301,8 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid());
+ 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());
FileHelper.deleteFiles(file);
return;
}
@@ -413,7 +418,7 @@
for (MetaFileEntity mf : list) {
boolean isXls = StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
if (mf.getRows() > -1 && isXls) {
- MetaEntity old = metaService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null == old) {
xlsList.add(mf);
} else {
--
Gitblit v1.9.3