|
35 | 35 | import java.time.Instant; |
36 | 36 | import java.util.ArrayList; |
37 | 37 | import java.util.List; |
38 | | - |
39 | 38 | @Service |
40 | 39 | public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> implements ResourceService { |
41 | 40 | /** |
@@ -195,17 +194,21 @@ public Resource resourceUpload(Resource resource) { |
195 | 194 | String resourceUrl = tinyEngineUrl + "/" + imageEncodedName; |
196 | 195 | String thumbnailUrl = tinyEngineUrl + "/" + thumbnailEncodedName; |
197 | 196 |
|
198 | | - if (!StringUtils.isEmpty(resourceData)) { |
199 | | - resource.setResourceUrl(resourceUrl); |
200 | | - resource.setThumbnailUrl(thumbnailUrl); |
201 | | - resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); |
202 | | - } |
| 197 | + |
203 | 198 | QueryWrapper<Resource> queryWrapper = new QueryWrapper<>(); |
204 | 199 | queryWrapper.eq("hash", resource.getHash()); |
| 200 | + queryWrapper.eq("app_id", resource.getAppId()); |
| 201 | + queryWrapper.eq("tenant_id", loginUserContext.getTenantId()); |
205 | 202 | // 接入租户系统需添加租户id查询 |
206 | 203 | Resource resourceResult = this.baseMapper.selectOne(queryWrapper); |
207 | 204 | if (resourceResult != null) { |
208 | | - throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg()); |
| 205 | + return resourceResult; |
| 206 | + } |
| 207 | + if (!StringUtils.isEmpty(resourceData)) { |
| 208 | + resource.setTenantId(loginUserContext.getTenantId()); |
| 209 | + resource.setResourceUrl(resourceUrl); |
| 210 | + resource.setThumbnailUrl(thumbnailUrl); |
| 211 | + resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); |
209 | 212 | } |
210 | 213 | int createResult = this.baseMapper.createResource(resource); |
211 | 214 | if (createResult != 1) { |
|
0 commit comments