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 | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 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 af502c7..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 {
@@ -138,6 +147,7 @@
int rows = basicMapper.insertBatch(list);
if (rows > 0) {
+ mf.setEntity(mf.getTab());
mf.setTab(tabName);
mf.setRows(rows);
}
@@ -218,9 +228,12 @@
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());
+ mf.setEntity(old.getLayer());
+ mf.setRows(old.getRows());
file.delete();
return 0;
}
@@ -288,9 +301,8 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
if (null != old) {
- mf.setPath(old.getPath());
FileHelper.deleteFiles(file);
return;
}
@@ -324,7 +336,7 @@
*/
private String findPathByGuid(List<MetaFileEntity> list, MetaFileEntity mf) {
for (MetaFileEntity meta : list) {
- if (meta.getGuid().equals(mf.getGuid())) {
+ if (meta.getGuid().equals(mf.getGuid()) && !meta.getPath().equals(mf.getPath())) {
return meta.getPath();
}
}
@@ -368,6 +380,9 @@
if (mf.getRows() > 0) {
me.setTab(mf.getTab());
}
+ if (!StringHelper.isEmpty(mf.getEntity())) {
+ me.setLayer(mf.getEntity());
+ }
me.setRows(mf.getRows());
me.setCreateUser(mf.getCreateUser());
me.setCreateTime(mf.getCreateTime());
@@ -403,7 +418,14 @@
for (MetaFileEntity mf : list) {
boolean isXls = StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
if (mf.getRows() > -1 && isXls) {
- xlsList.add(mf);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ if (null == old) {
+ xlsList.add(mf);
+ } else {
+ mf.setTab(old.getTab());
+ mf.setEntity(old.getLayer());
+ mf.setRows(old.getRows());
+ }
}
}
@@ -433,11 +455,11 @@
MetaFileEntity meta = new MetaFileEntity();
meta.setPath(StringHelper.join(pathList, ","));
meta.setEpsgCode(xlsList.get(0).getEpsgCode());
- meta.setName(StringHelper.join(dirList, ","));
+ meta.setName(StringHelper.join(dirList, ";"));
meta.setDepid(xlsList.get(0).getDepid());
meta.setVerid(xlsList.get(0).getVerid());
meta.setCreateUser(xlsList.get(0).getCreateUser());
- meta.setEventid(StringHelper.join(pidList, ","));
+ meta.setEventid(StringHelper.join(pidList, ";"));
return meta;
}
--
Gitblit v1.9.3