From 445acb921e3886b2c2012e5343c4e4c7ad5bc6e9 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 25 十一月 2022 08:22:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index c0af34d..efe5704 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -211,12 +211,11 @@
public void insertFiles(MetaEntity entity, List<MetaFileEntity> list, List<TabMapperEntity> tabList) {
try {
String temp = pathHelper.getConfig().getTempPath();
- String full = pathHelper.getUploadFullPath();
- String root = pathHelper.getConfig().getUploadPath();
+ String upload = pathHelper.getUploadFullPath();
for (MetaFileEntity mf : list) {
File file = new File(temp + File.separator + mf.getPath());
- File newFile = new File(root + File.separator + mf.getGuid());
+ File newFile = new File(upload + File.separator + mf.getGuid());
String type = getType(mf.getName().toLowerCase());
if (null == type) {
@@ -250,13 +249,11 @@
insertXls(temp, mf, tab);
break;
}
- int rows = tab.getRows();
- if (rows == 0) {
+ if (0 == tab.getRows()) {
continue;
}
- MetaEntity me = createMetaEntity(entity, mf);
- // me.setTab,me.setRow
+ MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows());
if (metaService.insert(me) == 0) {
continue;
}
@@ -266,8 +263,7 @@
metaService.delete(me.getId());
continue;
}
-
- count += rows;
+ count += tab.getRows();
}
if (count == 0 || null != old) {
@@ -320,7 +316,7 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf, String tab, int rows) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
@@ -331,6 +327,8 @@
me.setDescr(entity.getDescr());
me.setName(mf.getName());
me.setSizes(mf.getSizes());
+ me.setTab(tab);
+ me.setRows(rows);
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
@@ -362,9 +360,10 @@
return;
}
+ String tabName = BaseQueryService.getTabName(basicMapper);
String className = ClassHelper.getClassName(basicMapper);
Class clazz = ClassHelper.getEntityClass(className);
- if (null == clazz) {
+ if (null == clazz || null == tabName) {
return;
}
@@ -382,6 +381,7 @@
updateXlsGeom((GeomBaseMapper) basicMapper, list);
}
+ tab.setTab(tabName);
tab.setRows(rows);
}
@@ -439,9 +439,10 @@
return;
}
+ String tabName = BaseQueryService.getTabName(basicMapper);
String className = ClassHelper.getClassName(basicMapper);
Class clazz = ClassHelper.getEntityClass(className);
- if (null == clazz) {
+ if (null == clazz || null == tabName) {
return;
}
@@ -463,10 +464,10 @@
if (null == list || list.isEmpty()) {
return;
}
-
setCreateInfo(list, mf);
- int rows = basicMapper.insertBatch(list);
+ int rows = basicMapper.insertBatch(list);
+ tab.setTab(tabName);
tab.setRows(rows);
}
--
Gitblit v1.9.3