diff --git a/src/main/java/com/ycwl/basic/puzzle/service/impl/PuzzleGenerateServiceImpl.java b/src/main/java/com/ycwl/basic/puzzle/service/impl/PuzzleGenerateServiceImpl.java index c451ff7b..c1ca4227 100644 --- a/src/main/java/com/ycwl/basic/puzzle/service/impl/PuzzleGenerateServiceImpl.java +++ b/src/main/java/com/ycwl/basic/puzzle/service/impl/PuzzleGenerateServiceImpl.java @@ -348,10 +348,12 @@ public class PuzzleGenerateServiceImpl implements IPuzzleGenerateService { // 上传到OSS try (FileInputStream fis = new FileInputStream(qrcode)) { - String fileName = String.format("qrcode_%d_%s.jpg", - faceId, - UUID.randomUUID().toString().replace("-", "").substring(0, 16)); - + String fileName = String.format("qrcode_%d.jpg", faceId); + boolean exists = StorageFactory.use().isExists("puzzle", "wechat_qrcode", fileName); + if (exists) { + log.debug("微信小程序二维码已存在, 不重复上传: faceId={}, url={}", faceId, StorageFactory.use().getUrl("puzzle", "wechat_qrcode", fileName)); + return StorageFactory.use().getUrl("puzzle", "wechat_qrcode", fileName); + } return StorageFactory.use().uploadFile( "image/jpeg", fis, diff --git a/src/main/java/com/ycwl/basic/puzzle/util/PuzzleDuplicationDetector.java b/src/main/java/com/ycwl/basic/puzzle/util/PuzzleDuplicationDetector.java index 4287a8e5..0cb8ddd4 100644 --- a/src/main/java/com/ycwl/basic/puzzle/util/PuzzleDuplicationDetector.java +++ b/src/main/java/com/ycwl/basic/puzzle/util/PuzzleDuplicationDetector.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Component @RequiredArgsConstructor public class PuzzleDuplicationDetector { - + private final Set skippedElementKeys = Set.of("dateStr"); private final PuzzleGenerationRecordMapper recordMapper; /** @@ -50,6 +50,9 @@ public class PuzzleDuplicationDetector { StringBuilder sb = new StringBuilder(); for (int i = 0; i < sortedKeys.size(); i++) { String key = sortedKeys.get(i); + if (skippedElementKeys.contains(key)) { + continue; + } String value = finalData.get(key); sb.append(key).append(":").append(value != null ? value : ""); if (i < sortedKeys.size() - 1) {