Skip to content

fix: return existing resource on duplicate upload #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chilingling merged 8 commits into from
Jul 6, 2026
Merged

fix: return existing resource on duplicate upload #320

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9efbcce
fix:resourceUpload
msslulu Jul 2, 2026
d46f8f4
fix:resourceUpload
msslulu Jul 2, 2026
a28aab5
fix:resourceUpload
msslulu Jul 2, 2026
b9504cd
fix:resourceUpload
msslulu Jul 2, 2026
f0997ed
fix:resourceUpload
msslulu Jul 6, 2026
371e135
fix:resourceUpload
msslulu Jul 6, 2026
f5cf67a
fix:resourceUpload
msslulu Jul 6, 2026
3ed37fc
fix:resourceUpload
msslulu Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;

@Service
public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> implements ResourceService {
/**
Expand Down Expand Up @@ -195,17 +194,21 @@ public Resource resourceUpload(Resource resource) {
String resourceUrl = tinyEngineUrl + "/" + imageEncodedName;
String thumbnailUrl = tinyEngineUrl + "/" + thumbnailEncodedName;

if (!StringUtils.isEmpty(resourceData)) {
resource.setResourceUrl(resourceUrl);
resource.setThumbnailUrl(thumbnailUrl);
resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200));
}

QueryWrapper<Resource> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("hash", resource.getHash());
queryWrapper.eq("app_id", resource.getAppId());
queryWrapper.eq("tenant_id", loginUserContext.getTenantId());
// 接入租户系统需添加租户id查询
Resource resourceResult = this.baseMapper.selectOne(queryWrapper);
if (resourceResult != null) {
throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg());
return resourceResult;
}
if (!StringUtils.isEmpty(resourceData)) {
resource.setTenantId(loginUserContext.getTenantId());
resource.setResourceUrl(resourceUrl);
resource.setThumbnailUrl(thumbnailUrl);
resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200));
}
Comment thread
msslulu marked this conversation as resolved.
int createResult = this.baseMapper.createResource(resource);
if (createResult != 1) {
Expand Down
Loading