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

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

Browse Source
This commit is contained in:
shahaibo
2025-04-02 17:14:32 +08:00
parent b6367d72ba 2e76bded8c
commit 0eb02c598e
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java
View File

@@ -72,7 +72,19 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
// 标志是否有更改过模特比例（即更换模特图）
boolean flag = !url.equals(libModel.getUrl());
if (libraryModelPointDTO.getIsCovered() && Objects.nonNull(libraryModelPointDTO.getTemplateId())){
if (libraryModelPointDTO.getIsCovered()){
// 更新模特图片
if (flag){
libModel.setUrl(url);
libModel.setMd5(MD5Utils.encryptFile(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), false));
List<Integer> imagesWidthAndHeight = minioUtil.getImagesWidthAndHeight(url);
libModel.setWidth(imagesWidthAndHeight.get(0));
libModel.setHigh(imagesWidthAndHeight.get(1));
libModel.setUpdateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
libraryService.updateById(libModel);
}
if (Objects.nonNull(libraryModelPointDTO.getTemplateId())){
// 覆盖保存，即更新原有数据（点位数据和模特图片）
LibraryModelPoint modelPoint = getById(libraryModelPointDTO.getTemplateId());
if (Objects.isNull(modelPoint)) {
@@ -85,17 +97,16 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
updateById(modelPoint);
libraryModelPointVO.setTemplateId(modelPoint.getId());
libraryModelPointVO.setRelationId(libraryModelPointDTO.getLibraryId());
// 更新模特图片
if (flag){
libModel.setUrl(url);
libModel.setMd5(MD5Utils.encryptFile(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), false));
List<Integer> imagesWidthAndHeight = minioUtil.getImagesWidthAndHeight(url);
libModel.setWidth(imagesWidthAndHeight.get(0));
libModel.setHigh(imagesWidthAndHeight.get(1));
libModel.setUpdateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
libraryService.updateById(libModel);
}else {
// 新增模特点位信息
LibraryModelPoint libraryModelPoint = resolvePoint(libraryModelPointDTO);
libraryModelPoint.setModelType("Library");
libraryModelPoint.setCreateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
save(libraryModelPoint);
libraryModelPointVO.setTemplateId(libraryModelPoint.getId());
libraryModelPointVO.setRelationId(libraryModelPointDTO.getLibraryId());
}
}else {
// 不覆盖，即另存为
// 新增模特library信息