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

This commit is contained in:
shahaibo
2023-11-15 13:32:33 +08:00
4 changed files with 24 additions and 2 deletions

View File

@@ -168,6 +168,9 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
if (StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type())){
throw new BusinessException("level2Type.cannot.be.empty");
}
if (StringUtil.isNullOrEmpty(generateLikeDTO.getGender())){
throw new BusinessException("gender.cannot.be.empty");
}
}
// 1.2 判断参数是否真实有效
Long generateDetailId = generateLikeDTO.getGenerateDetailId();
@@ -183,7 +186,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
// 2、将like的图片信息存入library
// 2.1、不能重复喜欢
Library libraryDetail = libraryService.getById(generateDetail.getLibraryId());
if (Objects.nonNull(generateDetail.getLibraryId()) || Objects.nonNull(libraryDetail)){
if ( (Objects.nonNull(generateDetail.getLibraryId()) && !generateDetail.getLibraryId().equals(0L))
|| Objects.nonNull(libraryDetail)){
throw new BusinessException("duplicate.likes.are.not.allowed");
}
// 2.2、添加到library
@@ -227,7 +231,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
library.setAccountId(accountId);
library.setLevel1Type(generateLikeDTO.getLevel1Type());
library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type());
library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender());
library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G");
library.setUrl(imageUrl);
try {
library.setMd5(MD5Utils.encryptFile(minioUtil.download(imageUrl)));