From 9efbcce64dbdc0969d751717a47b9ac1a7aeb11c Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Thu, 2 Jul 2026 01:27:23 -0700 Subject: [PATCH 1/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index 63507530..d8f5ac1c 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -200,13 +200,7 @@ public Resource resourceUpload(Resource resource) { resource.setThumbnailUrl(thumbnailUrl); resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("hash", resource.getHash()); - // 接入租户系统需添加租户id查询 - Resource resourceResult = this.baseMapper.selectOne(queryWrapper); - if (resourceResult != null) { - throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg()); - } + int createResult = this.baseMapper.createResource(resource); if (createResult != 1) { throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg()); From d46f8f438c33adb0ddd85d104328e024ada014db Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Thu, 2 Jul 2026 02:36:27 -0700 Subject: [PATCH 2/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index d8f5ac1c..d9c68e2c 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -200,7 +200,13 @@ public Resource resourceUpload(Resource resource) { resource.setThumbnailUrl(thumbnailUrl); resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); } - + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hash", resource.getHash()); + // 接入租户系统需添加租户id查询 + Resource resourceResult = this.baseMapper.selectOne(queryWrapper); + if (resourceResult != null) { + return resourceResult; + } int createResult = this.baseMapper.createResource(resource); if (createResult != 1) { throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg()); From a28aab51edb307e4c76dad8ae3bcc1f42f872f1a Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Thu, 2 Jul 2026 02:52:41 -0700 Subject: [PATCH 3/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index d9c68e2c..e15c7bb8 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -195,11 +195,7 @@ 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 queryWrapper = new QueryWrapper<>(); queryWrapper.eq("hash", resource.getHash()); // 接入租户系统需添加租户id查询 @@ -207,6 +203,11 @@ public Resource resourceUpload(Resource resource) { if (resourceResult != null) { return resourceResult; } + if (!StringUtils.isEmpty(resourceData)) { + resource.setResourceUrl(resourceUrl); + resource.setThumbnailUrl(thumbnailUrl); + resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); + } int createResult = this.baseMapper.createResource(resource); if (createResult != 1) { throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg()); From b9504cd78fc38d8e3807266796c3676a3dd5b01a Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Thu, 2 Jul 2026 04:34:43 -0700 Subject: [PATCH 4/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index e15c7bb8..d8680e9e 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -198,6 +198,8 @@ public Resource resourceUpload(Resource resource) { QueryWrapper 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) { From f0997ed3275335f82fec3b7cd4a3a9fd3181933d Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Sun, 5 Jul 2026 19:19:07 -0700 Subject: [PATCH 5/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index d8680e9e..8d584c6b 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -26,6 +26,7 @@ import com.tinyengine.it.model.entity.Resource; import com.tinyengine.it.model.entity.ResourceGroupResource; import com.tinyengine.it.service.material.ResourceService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +36,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; - +@Slf4j @Service public class ResourceServiceImpl extends ServiceImpl implements ResourceService { /** @@ -197,15 +198,20 @@ public Resource resourceUpload(Resource resource) { QueryWrapper queryWrapper = new QueryWrapper<>(); + log.info("hash: " + resource.getHash()); + log.info("app id : " + resource.getAppId()); + log.info("tenantId : " + loginUserContext.getTenantId()); queryWrapper.eq("hash", resource.getHash()); queryWrapper.eq("app_id", resource.getAppId()); queryWrapper.eq("tenant_id", loginUserContext.getTenantId()); // 接入租户系统需添加租户id查询 Resource resourceResult = this.baseMapper.selectOne(queryWrapper); + log.info("resourceResult: " + resourceResult); if (resourceResult != null) { return resourceResult; } if (!StringUtils.isEmpty(resourceData)) { + resource.setTenantId(loginUserContext.getTenantId()); resource.setResourceUrl(resourceUrl); resource.setThumbnailUrl(thumbnailUrl); resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); From 371e13509edf6c026c8b20dee00e556d4d705c9d Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Sun, 5 Jul 2026 23:36:23 -0700 Subject: [PATCH 6/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index 8d584c6b..b99d0ac4 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -198,9 +198,6 @@ public Resource resourceUpload(Resource resource) { QueryWrapper queryWrapper = new QueryWrapper<>(); - log.info("hash: " + resource.getHash()); - log.info("app id : " + resource.getAppId()); - log.info("tenantId : " + loginUserContext.getTenantId()); queryWrapper.eq("hash", resource.getHash()); queryWrapper.eq("app_id", resource.getAppId()); queryWrapper.eq("tenant_id", loginUserContext.getTenantId()); From f5cf67a4569215bf7f21dbbda17597fcec593161 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Mon, 6 Jul 2026 01:10:58 -0700 Subject: [PATCH 7/8] fix:resourceUpload --- .../tinyengine/it/service/material/impl/ResourceServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index b99d0ac4..47fa04b4 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -203,7 +203,6 @@ public Resource resourceUpload(Resource resource) { queryWrapper.eq("tenant_id", loginUserContext.getTenantId()); // 接入租户系统需添加租户id查询 Resource resourceResult = this.baseMapper.selectOne(queryWrapper); - log.info("resourceResult: " + resourceResult); if (resourceResult != null) { return resourceResult; } From 3ed37fcfff61334bf6cbe04906030c220f29f8ab Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Mon, 6 Jul 2026 03:32:29 -0700 Subject: [PATCH 8/8] fix:resourceUpload --- .../it/service/material/impl/ResourceServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index 47fa04b4..ea71b805 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -26,7 +26,6 @@ import com.tinyengine.it.model.entity.Resource; import com.tinyengine.it.model.entity.ResourceGroupResource; import com.tinyengine.it.service.material.ResourceService; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,7 +35,6 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -@Slf4j @Service public class ResourceServiceImpl extends ServiceImpl implements ResourceService { /**