From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
index 1e7f0a1..5b379d5 100644
--- a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
@@ -280,8 +280,12 @@
private static String PLATFORM_CODE = "0001";
- @SuppressWarnings("finally")
public static String nextId(String idLength) {
+ return nextId(idLength,true);
+ }
+
+ @SuppressWarnings("finally")
+ public static String nextId(String idLength,boolean hasRandom) {
LOCK.lock();
try {
if (lastCount == ONE_STEP) {
@@ -290,7 +294,9 @@
count = lastCount++;
} finally {
LOCK.unlock();
- return getRandom() + String.format(idLength, count);
+ String id = (hasRandom?getRandom():"") + String.format(idLength, count);
+ id = id.replace("-","");
+ return id;
}
}
@@ -346,6 +352,19 @@
//璋冪敤鏈嶅姟
return getCode(prefix);
}
+ /**
+ * pgId鐢熸垚
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getDetailId(String prefix) throws GenerateCodeException {
+ if (!MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_NEED_INVOKE_GENERATE_ID))) {
+ return prefix + DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_O) + nextId("%04d",false);
+ }
+ //璋冪敤鏈嶅姟
+ return getCode(prefix);
+ }
/**
* 鑾峰彇杞︿綅ID
--
Gitblit v1.8.0