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 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 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);