diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index 2c38937d..6d7cdee5 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -90,7 +90,11 @@ public class LibraryController { } String md5 = MD5Utils.encryptFile(file); if (checkMd5 == null || checkMd5 == 1) { - libraryService.checkMd5(level1Type, level2Type, sex, md5); + if (!libraryService.checkMd5(level1Type, level2Type, sex, md5)) { + LibraryUpdateVo libraryUpdateVo = new LibraryUpdateVo(); + libraryUpdateVo.setCheckMd5(Boolean.FALSE); + return Response.success(libraryUpdateVo); + } } return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type,level2Type, timeZone, md5,high,width,modelType,sex))); diff --git a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java index 3b104be4..f83556e1 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java +++ b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java @@ -43,5 +43,8 @@ public class LibraryUpdateVo implements Serializable { @ApiModelProperty("存放地址") private String minIOPath; + + @ApiModelProperty("校验md5") + private Boolean checkMd5; } diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java index be8182a7..5536fa30 100644 --- a/src/main/java/com/ai/da/service/LibraryService.java +++ b/src/main/java/com/ai/da/service/LibraryService.java @@ -72,5 +72,5 @@ public interface LibraryService extends IService { String processMannequins(String uploadPath); - void checkMd5(String level1Type, String level2Type, String sex, String md5); + Boolean checkMd5(String level1Type, String level2Type, String sex, String md5); } 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 dc2f9234..20268383 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -258,7 +258,7 @@ public class LibraryServiceImpl extends ServiceImpl impl } @Override - public void checkMd5(String level1Type, String level2Type, String sex, String md5) { + public Boolean checkMd5(String level1Type, String level2Type, String sex, String md5) { AuthPrincipalVo userInfo = UserContext.getUserHolder(); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(Library::getAccountId, userInfo.getId()); @@ -274,7 +274,10 @@ public class LibraryServiceImpl extends ServiceImpl impl qw.lambda().eq(Library::getMd5, md5); List libraryList = libraryMapper.selectList(qw); if (!CollectionUtils.isEmpty(libraryList)) { - throw new BusinessException("Your library already contains the images you uploaded, Are you sure to upload them"); +// throw new BusinessException("Your library already contains the images you uploaded, Are you sure to upload them"); + return Boolean.FALSE; + }else { + return Boolean.TRUE; } }