diff --git a/src/main/java/com/guo/learningprogresstracker/utils/GenerateNumTool.java b/src/main/java/com/guo/learningprogresstracker/utils/GenerateNumTool.java index 79276d3..59dc9c7 100644 --- a/src/main/java/com/guo/learningprogresstracker/utils/GenerateNumTool.java +++ b/src/main/java/com/guo/learningprogresstracker/utils/GenerateNumTool.java @@ -2,36 +2,51 @@ package com.guo.learningprogresstracker.utils; import lombok.RequiredArgsConstructor; +import java.security.SecureRandom; import java.text.SimpleDateFormat; import java.util.Date; /** * 用于生成编码的工具 + *
编码格式:{@code PREFIX-yyyyMMdd-<6 位毫秒片段><6 位随机数>}。
+ *此前只用「毫秒时间戳对 1_000_000 取模」的 6 位片段,同一毫秒内会生成完全相同的编码, + * 且该片段每 16.7 分钟就会重复一轮;现在追加 6 位随机数把撞号概率降到 1e-6 量级, + * 最终防线是数据库唯一索引(见迁移 {@code V20261009_3})。
*/ @RequiredArgsConstructor public class GenerateNumTool { - private static int getNextSequence() { - long timestamp = System.currentTimeMillis(); - return (int) (timestamp % 1_000_000); + + /** 毫秒片段取值范围:保持既有编码的可读形态 */ + private static final int MILLIS_SEQUENCE_BOUND = 1_000_000; + + /** 随机位取值范围:6 位 */ + private static final int RANDOM_BOUND = 1_000_000; + + private static final SecureRandom RANDOM = new SecureRandom(); + + private static long getNextSequence() { + return System.currentTimeMillis() % MILLIS_SEQUENCE_BOUND; } /** - * 生成以prefix开头separator分割的编码 - * 例如:PREFIX—20240711-423468 - * @param prefix - * @param separator - * @return + * 生成以 prefix 开头、separator 分割的编码 + * 例如:PREFIX-20240711-423468123905 */ public static String generateNum(String prefix, String separator) { String currentDate = new SimpleDateFormat("yyyyMMdd").format(new Date()); - int sequence = getNextSequence(); - return prefix + separator + currentDate + separator + sequence; + return prefix + separator + currentDate + separator + randomSuffix(); } public static String generateNum(String prefix) { - String separator = "-"; - String currentDate = new SimpleDateFormat("yyyyMMdd").format(new Date()); - int sequence = getNextSequence(); - return prefix + separator + currentDate + separator + sequence; + return generateNum(prefix, "-"); + } + + /** + * 编码后缀:6 位毫秒片段 + 6 位随机数,固定 12 位,便于阅读与排序。 + */ + private static String randomSuffix() { + long sequence = getNextSequence(); + int random = RANDOM.nextInt(RANDOM_BOUND); + return String.format("%06d%06d", sequence, random); } } diff --git a/src/main/resources/db/migration/V20261009_3__add_unique_indexes_for_business_num.sql b/src/main/resources/db/migration/V20261009_3__add_unique_indexes_for_business_num.sql new file mode 100644 index 0000000..462d7e4 --- /dev/null +++ b/src/main/resources/db/migration/V20261009_3__add_unique_indexes_for_business_num.sql @@ -0,0 +1,12 @@ +-- 业务编号唯一约束(数据-03)。 +-- 编号生成已改为「6 位毫秒片段 + 6 位随机数」(GenerateNumTool),唯一索引是最终防线: +-- 撞号时按编号取单条记录会抛多行异常,属于数据正确性问题。 +-- 说明:索引以 created_by 打头(多租户,编号只需在租户内唯一)。 +-- 注意:若历史数据中已存在重复编号,本迁移会失败 —— 这是有意为之:需要人工确认后再处理, +-- 而不是静默跳过约束。 + +ALTER TABLE tasks + ADD CONSTRAINT uk_tasks_created_by_task_num UNIQUE (created_by, task_num); + +ALTER TABLE study_sessions + ADD CONSTRAINT uk_study_sessions_created_by_session_num UNIQUE (created_by, session_num); diff --git a/src/test/java/com/guo/learningprogresstracker/utils/GenerateNumToolTest.java b/src/test/java/com/guo/learningprogresstracker/utils/GenerateNumToolTest.java index 0741484..a5a784d 100644 --- a/src/test/java/com/guo/learningprogresstracker/utils/GenerateNumToolTest.java +++ b/src/test/java/com/guo/learningprogresstracker/utils/GenerateNumToolTest.java @@ -4,7 +4,10 @@ import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.HashSet; +import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; class GenerateNumToolTest { @@ -14,14 +17,23 @@ class GenerateNumToolTest { String today = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); String code = GenerateNumTool.generateNum("ORD"); assertTrue(code.startsWith("ORD-" + today + "-"), "实际值: " + code); - // 序列为毫秒时间戳对 1_000_000 取模,最多 6 位数字 - assertTrue(code.matches("ORD-" + today + "-\\d{1,6}"), "实际值: " + code); + // 后缀 = 6 位毫秒片段 + 6 位随机数 + assertTrue(code.matches("ORD-" + today + "-\\d{12}"), "实际值: " + code); } @Test void generateNum_customSeparator_prefixDateSequence() { String today = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); String code = GenerateNumTool.generateNum("BIZ", "_"); - assertTrue(code.matches("BIZ_" + today + "_\\d{1,6}"), "实际值: " + code); + assertTrue(code.matches("BIZ_" + today + "_\\d{12}"), "实际值: " + code); + } + + @Test + void generateNum_burstGeneration_shouldNotCollide() { + Set