From f2a65e490f0cab0a4d883f3a200aefc1bbfb6284 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Fri, 21 Feb 2025 17:11:05 +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..bff1051 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 orderType + datePart + String.format("%05d", randomPart) + dataId;
}
}
--
Gitblit v1.9.2