From 3eceb59d2e062d3ea65972849f1ae88bc8bf497b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 21:01:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DataUploadService.java | 51 +++++++++++++--------------------------------------
1 files changed, 13 insertions(+), 38 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 0d326ee..e337656 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -1,8 +1,8 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.all.BaseUploadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,30 +19,21 @@
@Autowired
MetaService metaService;
- @Autowired
- MetaFileService metaFileService;
-
/**
* 鎻掑叆鏂囦欢
*/
- public int insertFiles(MetaEntity entity, List<MetaFileEntity> list) {
+ public int insertFiles(MetaEntity entity, List<MetaEntity> list) {
int count = 0;
try {
String temp = pathHelper.getConfig().getTempPath();
String root = pathHelper.getUploadFullPath();
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
String filePath = getFilePath(temp, root, mf);
// 鍏冩暟鎹�
- MetaEntity me = createMetaEntity(entity, mf);
- if (metaService.insert(me) < 1) {
- continue;
- }
-
- // 鍏冩暟鎹枃浠�
- MetaFileEntity mfe = createMetaFileEntity(entity, mf, filePath);
- if (metaFileService.insert(mfe) > 0) {
+ MetaEntity me = createMetaEntity(entity, mf, filePath);
+ if (metaService.insert(me) > 0) {
count++;
}
}
@@ -56,12 +47,12 @@
/**
* 鑾峰彇鏂囦欢璺緞
*/
- private String getFilePath(String temp, String root, MetaFileEntity mf) {
+ private String getFilePath(String temp, String root, MetaEntity 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());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid());
String filePath = null;
if (null == old) {
@@ -78,36 +69,20 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, 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("file");
- me.setGather(entity.getGather());
- me.setBatch(entity.getBatch());
- me.setDescr(entity.getDescr());
me.setName(mf.getName());
+ me.setType("file");
+ me.setGuid(entity.getGuid());
+ me.setPath(FileHelper.getRelativePath(filePath));
me.setSizes(mf.getSizes());
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
return me;
- }
-
- /**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
- */
- private MetaFileEntity createMetaFileEntity(MetaEntity metaEntity, MetaFileEntity entity, String filePath) {
- MetaFileEntity mfe = new MetaFileEntity();
- mfe.setName(entity.getName());
- mfe.setMetaid(metaEntity.getId());
- mfe.setGuid(entity.getGuid());
- mfe.setSizes(entity.getSizes());
- mfe.setPath(FileHelper.getRelativePath(filePath));
- mfe.setCreateUser(metaEntity.getCreateUser());
- mfe.setCreateTime(metaEntity.getCreateTime());
-
- return mfe;
}
}
--
Gitblit v1.9.3