From f8b251573040d2762507909a02f274a6cf4d751c Mon Sep 17 00:00:00 2001 From: heheng <heheng@123456> Date: 星期四, 23 一月 2025 14:40:27 +0800 Subject: [PATCH] 特种作业非煤缴费版本优化 --- ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java index 89ed10b..80a68c2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java @@ -35,20 +35,20 @@ public static void main(String[] args) { String s = generateRandomString(26); System.out.println(s); - System.out.println(generateOrderNumber()); + System.out.println(generateOrderNumber(10L, "NC")); } + private static final Random RANDOM = new Random(); private static final AtomicInteger SEQUENCE = new AtomicInteger(0); private static final int MAX_SEQUENCE = 99999;// 5位数的序列号 private static final String ORDER_PER = "SN"; - public static synchronized String generateOrderNumber() { + public static String generateOrderNumber(Long dataId, String orderType) { String datePart = new SimpleDateFormat("yyyyMMddhhmm").format(new Date()); - int sequencePart = SEQUENCE.getAndIncrement() % MAX_SEQUENCE; - String sequenceStr = String.format("%05d", sequencePart); // 保证序列号是5位数,不足的前面补0 + int randomPart = RANDOM.nextInt(90000) + 10000; // 生成5位随机数 - return ORDER_PER + datePart + sequenceStr; + return ORDER_PER + datePart + String.format("%05d", randomPart) + dataId; } } -- Gitblit v1.9.2