From c7e92c361f4180ba6839f1998c697261bb2c5c36 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 10:42:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/service/data/UploadService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..940638d 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -502,8 +502,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));
}
}
@@ -521,12 +521,13 @@
* 鎻掑叆婧愭暟鎹�
*/
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 ? "鎴愬姛" : "澶辫触");
@@ -536,8 +537,9 @@
/**
* 鍒涘缓婧愭暟鎹�
*/
- 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 +561,23 @@
return me;
}
+
+ /**
+ * 鎻掑叆鐖舵簮鏁版嵁
+ */
+ private int insertParentMeta(List<MetaFileEntity> list) {
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg() || !mf.getIsMeta()) {
+ continue;
+ }
+
+ MetaEntity me = createMeta(mf, 0);
+ metaService.insert(me);
+ mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+
+ return me.getId();
+ }
+
+ return 0;
+ }
}
--
Gitblit v1.9.3