From 43f760eb9dff0d983d58dc801772877f9cb1865f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 05 一月 2023 18:16:33 +0800
Subject: [PATCH] 1.5.3
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 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 8ced799..73b69bf 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -249,16 +249,11 @@
continue;
}
- MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows());
+ MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows(), filePath);
if (metaService.insert(me) == 0) {
continue;
}
- MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaService.insert(mfe) == 0) {
- metaService.delete(me.getId());
- continue;
- }
count += tab.getRows();
}
@@ -312,13 +307,15 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows, String filePath) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
me.setVerid(entity.getVerid());
me.setType(getType(mf.getName().toLowerCase()));
me.setName(mf.getName());
+ me.setGuid(entity.getGuid());
+ me.setPath(FileHelper.getRelativePath(filePath));
me.setSizes(mf.getSizes());
me.setBstab(tab);
me.setBsrows(rows);
@@ -326,22 +323,6 @@
me.setCreateUser(entity.getCreateUser());
return me;
- }
-
- /**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
- */
- private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
- MetaEntity mfe = new MetaEntity();
- mfe.setName(entity.getName());
- mfe.setMetaid(me.getId());
- mfe.setGuid(entity.getGuid());
- mfe.setSizes(entity.getSizes());
- mfe.setPath(FileHelper.getRelativePath(filePath));
- mfe.setCreateUser(me.getCreateUser());
- mfe.setCreateTime(me.getCreateTime());
-
- return mfe;
}
/**
--
Gitblit v1.9.3