From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 51ced2a..d94d80e 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -3,7 +3,6 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
-import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
@@ -70,12 +69,12 @@
excelLoader(list, req);
loadData(list);
copyFiles(list);
- publishFiles(list);
+ // publishFiles(list)
insertMetas(list);
}
/**
- * 妫�鏌ユ簮鏁版嵁鏂囦欢
+ * 妫�鏌ュ厓鏁版嵁鏂囦欢
*/
private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
Timestamp createTime = WebHelper.getCurrentTimestamp();
@@ -121,7 +120,7 @@
}
/**
- * 鑾峰彇Excel婧愭暟鎹枃浠�
+ * 鑾峰彇Excel鍏冩暟鎹枃浠�
*/
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
@@ -138,7 +137,7 @@
}
/**
- * 鑾峰彇Excel鐨勬簮鏁版嵁
+ * 鑾峰彇Excel鐨勫厓鏁版嵁
*/
private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
List<String> pathList = new ArrayList<>();
@@ -226,7 +225,7 @@
/**
* 鍔犺浇绌洪棿鏁版嵁
*/
- private void loadSpatialData(MetaFileEntity mf) {
+ public void loadSpatialData(MetaFileEntity mf) {
BasicMapper basicMapper = ClassHelper.getBasicMapper(mf.getEntity());
if (null == basicMapper) {
return;
@@ -502,8 +501,8 @@
}
for (String ext : exts) {
- File f=new File(source.replace(mf.getExtName(), ext));
- if (f.exists()&&!f.isDirectory()) {
+ File f = new File(source.replace(mf.getExtName(), ext));
+ if (f.exists() && !f.isDirectory()) {
createFileLink(source.replace(mf.getExtName(), ext), target.replace(mf.getExtName(), ext));
}
}
@@ -518,15 +517,16 @@
}
/**
- * 鎻掑叆婧愭暟鎹�
+ * 鎻掑叆鍏冩暟鎹�
*/
private void insertMetas(List<MetaFileEntity> list) {
+ int metaId = insertParentMeta(list);
for (MetaFileEntity mf : list) {
if (null != mf.getMsg()) {
continue;
}
- MetaEntity me = createMeta(mf);
+ MetaEntity me = createMeta(mf, metaId);
metaService.insert(me);
mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
@@ -534,10 +534,11 @@
}
/**
- * 鍒涘缓婧愭暟鎹�
+ * 鍒涘缓鍏冩暟鎹�
*/
- private MetaEntity createMeta(MetaFileEntity mf) {
+ private MetaEntity createMeta(MetaFileEntity mf, int metaId) {
MetaEntity me = new MetaEntity();
+ me.setMetaid(metaId);
me.setEventid(mf.getEventid());
me.setDircode(mf.getDircode());
me.setDepcode(mf.getDepcode());
@@ -559,4 +560,24 @@
return me;
}
+
+ /**
+ * 鎻掑叆鐖跺厓鏁版嵁
+ */
+ private int insertParentMeta(List<MetaFileEntity> list) {
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg() || !mf.getIsMeta()) {
+ continue;
+ }
+
+ MetaEntity me = createMeta(mf, 0);
+ me.setIsmeta((short) 1);
+ metaService.insert(me);
+ mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+
+ return me.getId();
+ }
+
+ return 0;
+ }
}
--
Gitblit v1.9.3