From 1212e2b0dea3b44668c5293a3267a6fb780b420f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 28 六月 2025 14:28:08 +0800
Subject: [PATCH] 2025-06-28 bug修改

---
 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java |    3 ++-
 src/main/java/com/ruoyi/project/common/CommonController.java                     |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index 4248da0..c575425 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.common;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
@@ -52,7 +53,7 @@
             {
                 throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
             }
-            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String realFileName =  fileName.substring(fileName.indexOf("_") + 1);
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index ddde6d5..99dd081 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -202,9 +202,10 @@
             // 鏋勫缓姝e紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟ID鍜屾椂闂存埑锛岄伩鍏嶅啿绐侊級
             String originalFilename = tempFile.getOriginalName();
             String fileExtension = FilenameUtils.getExtension(originalFilename);
+            String baseName = FilenameUtils.getBaseName(originalFilename);
             String formalFilename = businessId + "_" +
                     System.currentTimeMillis() + "_" +
-                    UUID.randomUUID().toString().substring(0, 8) +
+                    UUID.randomUUID().toString().substring(0, 8) +baseName+
                     (com.ruoyi.common.utils.StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
 
             Path formalFilePath = formalDirPath.resolve(formalFilename);

--
Gitblit v1.9.3