From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/data/DataQueryService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DataQueryService.java b/src/main/java/com/lf/server/service/data/DataQueryService.java
index 22a4752..283a1de 100644
--- a/src/main/java/com/lf/server/service/data/DataQueryService.java
+++ b/src/main/java/com/lf/server/service/data/DataQueryService.java
@@ -52,8 +52,15 @@
AttachEntity ae = getAttachEntity(ue, tabName, eventid, fileName, md5, sizes);
if (entity != null) {
ae.setPath(entity.getPath());
- newFile.delete();
- }else {
+
+ String oldPath = pathHelper.getConfig().getUploadPath() + File.separator + ae.getPath();
+ File f = new File(oldPath);
+ if (!f.exists() || f.isDirectory()) {
+ newFile.renameTo(new File(oldPath));
+ } else {
+ newFile.delete();
+ }
+ } else {
String targetPath = pathHelper.getConfig().getUploadPath() + File.separator + ae.getPath();
newFile.renameTo(new File(targetPath));
}
@@ -73,7 +80,7 @@
entity.setTabGuid(eventid);
entity.setName(fileName);
entity.setGuid(md5);
- String subPath = PathHelper.getUploadPath() + File.separator + md5+ FileHelper.getExtension(fileName);
+ String subPath = PathHelper.getUploadPath() + File.separator + md5 + FileHelper.getExtension(fileName);
entity.setPath(subPath);
entity.setSizes(sizes);
if (ue != null) {
--
Gitblit v1.9.3