aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
xupei
2023-11-15 13:22:36 +08:00
parent 35e6bb8cd9 c6561a4fe8
commit 9e58ed47ea
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
View File

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