From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DataUploadService.java | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DataUploadService.java b/src/main/java/com/lf/server/service/data/DataUploadService.java
index eff2496..4e368c6 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -32,27 +32,17 @@
String root = pathHelper.getUploadFullPath();
for (MetaFileEntity mf : list) {
- // 绉诲姩鏂囦欢
- File file = new File(temp + File.separator + mf.getPath());
- File newFile = new File(root + File.separator + mf.getName());
- file.renameTo(newFile);
+ String filePath = getFilePath(temp, root, mf);
// 鍏冩暟鎹�
- MetaEntity me = createMetaEntity(entity);
- me.setName(mf.getName());
- me.setSizes(mf.getSizes());
-
- Integer rows = metaService.insert(me);
- if (rows < 1) {
+ MetaEntity me = createMetaEntity(entity, mf);
+ if (metaService.insert(me) < 1) {
continue;
}
// 鍏冩暟鎹枃浠�
- MetaFileEntity mef = createMetaFileEntity(mf, entity);
- mef.setPath(FileHelper.getRelativePath(newFile.getPath()));
-
- rows = metaFileService.insert(mef);
- if (rows > 0) {
+ MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
+ if (metaFileService.insert(mfe) > 0) {
count++;
}
}
@@ -64,9 +54,31 @@
}
/**
+ * 鑾峰彇鏂囦欢璺緞
+ */
+ private String getFilePath(String temp, String root, MetaFileEntity mf) {
+ // 绉诲姩鏂囦欢
+ File file = new File(temp + File.separator + mf.getPath());
+ File newFile = new File(root + File.separator + mf.getGuid());
+
+ MetaFileEntity old = metaFileService.selectByGuid(mf.getGuid());
+
+ String filePath = null;
+ if (null == old) {
+ filePath = newFile.getPath();
+ file.renameTo(newFile);
+ } else {
+ filePath = old.getPath();
+ file.delete();
+ }
+
+ return filePath;
+ }
+
+ /**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
@@ -75,6 +87,8 @@
me.setGather(entity.getGather());
me.setBatch(entity.getBatch());
me.setDescr(entity.getDescr());
+ me.setName(mf.getName());
+ me.setSizes(mf.getSizes());
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
@@ -84,14 +98,15 @@
/**
* 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
*/
- private MetaFileEntity createMetaFileEntity(MetaFileEntity entity, MetaEntity metaEntity) {
+ private MetaFileEntity createMetaFileEntity(MetaEntity me, MetaFileEntity entity, String filePath) {
MetaFileEntity mfe = new MetaFileEntity();
mfe.setName(entity.getName());
- mfe.setMetaid(metaEntity.getId());
+ mfe.setMetaid(me.getId());
mfe.setGuid(entity.getGuid());
mfe.setSizes(entity.getSizes());
- mfe.setCreateUser(metaEntity.getCreateUser());
- mfe.setCreateTime(metaEntity.getCreateTime());
+ mfe.setPath(FileHelper.getRelativePath(filePath));
+ mfe.setCreateUser(me.getCreateUser());
+ mfe.setCreateTime(me.getCreateTime());
return mfe;
}
--
Gitblit v1.9.3