From d12b5b41ee33e7eb57f3c3fe00f4fae53eb93388 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 09:25:44 +0800
Subject: [PATCH] 1.6
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 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 a5bcbcf..92ce8e9 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -3,7 +3,6 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.ctrl.TabMapperEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
@@ -26,9 +25,6 @@
public class DataLoaderService extends BaseUploadService {
@Autowired
MetaService metaService;
-
- @Autowired
- MetaFileService metaFileService;
private final static String XLS = ".xls";
@@ -208,12 +204,12 @@
/**
* 鎻掑叆鏂囦欢
*/
- public void insertFiles(MetaEntity entity, List<MetaFileEntity> list, List<TabMapperEntity> tabList) {
+ public void insertFiles(MetaEntity entity, List<MetaEntity> list, List<TabMapperEntity> tabList) {
try {
String temp = pathHelper.getConfig().getTempPath();
String upload = pathHelper.getUploadFullPath();
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
File file = new File(temp + File.separator + mf.getPath());
File newFile = new File(upload + File.separator + mf.getGuid());
@@ -230,7 +226,7 @@
continue;
}
- MetaFileEntity old = metaFileService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid());
String filePath = null == old ? newFile.getPath() : old.getPath();
int count = 0;
@@ -253,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;
}
- MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaFileService.insert(mfe) == 0) {
- metaService.delete(me.getId());
- continue;
- }
count += tab.getRows();
}
@@ -280,7 +271,7 @@
/**
* 鑾峰彇 Tabs
*/
- private List<TabMapperEntity> getTabs(MetaFileEntity mfe, List<TabMapperEntity> tabs) {
+ private List<TabMapperEntity> getTabs(MetaEntity mfe, List<TabMapperEntity> tabs) {
List<TabMapperEntity> list = new ArrayList<>();
for (TabMapperEntity tab : tabs) {
if (!tab.getFileName().equals(mfe.getName()) || StringHelper.isEmpty(tab.getEntity())) {
@@ -316,19 +307,20 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity 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.setEventid(StringHelper.getGuid());
me.setDirid(entity.getDirid());
+ me.setDepid(entity.getDepid());
me.setVerid(entity.getVerid());
- me.setType(getType(mf.getName().toLowerCase()));
- me.setGather(entity.getGather());
- me.setBatch(entity.getBatch());
- me.setDescr(entity.getDescr());
me.setName(mf.getName());
+ me.setType(getType(mf.getName().toLowerCase()));
+ me.setGuid(entity.getGuid());
+ me.setPath(FileHelper.getRelativePath(filePath));
me.setSizes(mf.getSizes());
- me.setTab(tab);
- me.setRows(rows);
+ me.setBstab(tab);
+ me.setBsrows(rows);
+ // me.setMdtab()
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
@@ -336,25 +328,9 @@
}
/**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
- */
- private MetaFileEntity createMetaFileEntity(MetaEntity me, MetaFileEntity entity, String filePath) {
- MetaFileEntity mfe = new MetaFileEntity();
- 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;
- }
-
- /**
* 鎻掑叆Excel
*/
- private void insertXls(String root, MetaEntity me, MetaFileEntity mf, TabMapperEntity tab) {
+ private void insertXls(String root, MetaEntity me, MetaEntity mf, TabMapperEntity tab) {
BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
if (null == basicMapper) {
return;
@@ -396,6 +372,8 @@
for (T t : list) {
BaseEntity be = (BaseEntity) t;
+ be.setEventid(StringHelper.getGuid());
+ be.setParentid(me.getEventid());
be.setCreateuser(me.getCreateUser());
be.setCreatetime(me.getCreateTime());
be.setDirid(me.getDirid());
--
Gitblit v1.9.3