From c6561a4fe8544afdc960cf62fc49b6e3ea0110c5 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 15 Nov 2023 11:35:27 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=20library=E5=85=B3=E8=81=94=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/LibraryServiceImpl.java   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
index d8cd06eb..bd426491 100644
--- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
@@ -45,6 +45,8 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -407,7 +409,16 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
         if (StringUtils.isEmpty(uploadDTO.getModelType()) || uploadDTO.getModelType().equals(ModelType.LIBRARY.getValue())) {
             Library library = CopyUtil.copyObject(uploadDTO, Library.class);
             library.setAccountId(userInfo.getId());
-            library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
+            String originalFilename = uploadDTO.getFile().getOriginalFilename();
+            if (!StringUtils.isEmpty(originalFilename)) {
+                if (originalFilename.contains(".")) {
+                    library.setName(originalFilename.split("\\.")[0]);
+                }else {
+                    library.setName(originalFilename);
+                }
+            }else {
+                library.setName(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            }
             library.setUrl(filePath);
             //按时区计算
             library.setCreateDate(DateUtil.getByTimeZone(uploadDTO.getTimeZone()));
@@ -420,7 +431,16 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
             return library;
         } else if (uploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) {
             SysFile sysFile = new SysFile();
-            sysFile.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
+            String originalFilename = uploadDTO.getFile().getOriginalFilename();
+            if (!StringUtils.isEmpty(originalFilename)) {
+                if (originalFilename.contains(".")) {
+                    sysFile.setName(originalFilename.split("\\.")[0]);
+                }else {
+                    sysFile.setName(originalFilename);
+                }
+            }else {
+                sysFile.setName(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            }
             sysFile.setLevel1Type("Models");
             sysFile.setLevel2Type(uploadDTO.getModelSex());
             sysFile.setUrl(filePath);