From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploadService.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 a8dcc75..49710c1 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -57,13 +57,12 @@
/**
* 鎻掑叆鏂囦欢
*/
- public List<MetaEntity> insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
+ public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
excelLoader(list, req);
loadData(list);
copyFiles(list);
-
- return insertMetas(list);
+ insertMetas(list);
}
/**
@@ -291,6 +290,10 @@
private void copyFiles(List<MetaFileEntity> list) {
List<String> gdbList = new ArrayList<>();
for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg()) {
+ continue;
+ }
+
switch (mf.getExtName()) {
case StaticData.MPT:
copyMultiFile(mf, StaticData.MPT_EXT);
@@ -453,20 +456,17 @@
/**
* 鎻掑叆鍏冩暟鎹�
*/
- private List<MetaEntity> insertMetas(List<MetaFileEntity> list) {
- List<MetaEntity> metas = new ArrayList<>();
+ private void insertMetas(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
- if (StringHelper.isEmpty(mf.getMsg())) {
- metas.add(createMeta(mf));
+ if (null != mf.getMsg()) {
+ continue;
}
- }
- if (metas.isEmpty()) {
- return null;
- }
- int rows = metaService.inserts(metas);
+ MetaEntity me = createMeta(mf);
+ metaService.insert(me);
- return rows > 0 ? metas : null;
+ mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+ }
}
/**
--
Gitblit v1.9.3