From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/service/data/DataLoaderService.java | 91 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 54 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 6846f09..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";
@@ -100,8 +96,8 @@
getGdbFiles(f.getName(), subPath, list);
continue;
}
- if (!fileName.contains(ZIP)) {
- //
+ if (fileName.contains(ZIP)) {
+ // 鏆傛椂涓嶅疄鐜�
}
}
@@ -208,14 +204,14 @@
/**
* 鎻掑叆鏂囦欢
*/
- 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 root = pathHelper.getConfig().getUploadPath();
+ 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(root + File.separator + mf.getGuid());
+ File newFile = new File(upload + File.separator + mf.getGuid());
String type = getType(mf.getName().toLowerCase());
if (null == type) {
@@ -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;
@@ -242,27 +238,22 @@
case "shp":
case "gdb":
case "mdb":
- insertDb(type, temp, mf, tab);
+ insertDb(type, temp, entity, tab);
break;
// case "xls":
default:
- insertXls(temp, mf, tab);
+ insertXls(temp, entity, mf, tab);
break;
}
if (0 == tab.getRows()) {
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,17 +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.setBstab(tab);
+ me.setBsrows(rows);
+ // me.setMdtab()
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
@@ -334,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, 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;
@@ -369,7 +347,7 @@
if (list.isEmpty()) {
return;
}
- setCreateInfo(list, mf);
+ setCreateInfo(list, me);
int rows = 0;
for (int i = 0, c = list.size(); i < c; i++) {
@@ -386,16 +364,21 @@
/**
* 璁剧疆鍒涘缓淇℃伅
*/
- private <T> void setCreateInfo(List<T> list, MetaFileEntity mf) {
+ private <T> void setCreateInfo(List<T> list, MetaEntity me) {
try {
- for (T t : list) {
- Field cuField = t.getClass().getDeclaredField("createuser");
- cuField.setAccessible(true);
- cuField.set(t, mf.getCreateUser());
+ if (!(list.get(0) instanceof BaseEntity)) {
+ return;
+ }
- Field ctField = t.getClass().getDeclaredField("createtime");
- ctField.setAccessible(true);
- ctField.set(t, mf.getCreateTime());
+ 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());
+ be.setDepid(me.getDepid());
+ be.setVerid(me.getVerid());
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -431,7 +414,7 @@
/**
* 鎻掑叆DB
*/
- private void insertDb(String type, String root, MetaFileEntity mf, TabMapperEntity tab) {
+ private void insertDb(String type, String root, MetaEntity me, TabMapperEntity tab) {
BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
if (null == basicMapper) {
return;
@@ -462,7 +445,7 @@
if (null == list || list.isEmpty()) {
return;
}
- setCreateInfo(list, mf);
+ setCreateInfo(list, me);
int rows = basicMapper.insertBatch(list);
tab.setTab(tabName);
--
Gitblit v1.9.3