From 682a6e95720bc41cbd42480c2352301496091d89 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 19:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 13ca622..d826fc3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -319,7 +319,7 @@
@Override
@Async
@Transactional
- public void dealBaseData() {
+ public synchronized void dealBaseData() {
if(IS_RUNNING){
return;
}
@@ -700,17 +700,17 @@
FileRecord model = new FileRecord();
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
- model.setName(key);
- model.setInfo(tempFileName);
+ model.setName(tempFileName);
+ model.setInfo(null);
model.setFolder(folder);
model.setUrl(img);
model.setObjId(id);
model.setType(objType);
model.setStatus(Constants.ZERO);
-
+ model.setKeyval(key);
fileRecords.add(model);
- return key;
+ return tempFileName;
}catch (Exception e){
}
--
Gitblit v1.9.3