From 4cb2c280c69a7d6bb48b831df60f5f1a793097b5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 19 四月 2023 01:00:00 +0800
Subject: [PATCH] 优化部分不合规代码
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 e4422d0..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
@@ -67,6 +67,7 @@
public static final String CODE_PREFIX_propertyUserId = "93";
public static final String CODE_PREFIX_propertyFeeId = "94";
public static final String CODE_PREFIX_houseId = "95";
+ public static final String CODE_PREFIX_fadId = "96";
public static final String CODE_PREFIX_pgId = "600";
public static final String CODE_PREFIX_floorId = "73";
@@ -206,6 +207,8 @@
public static final String CODE_PREFIX_vipAcctId = "32";
public static final String CODE_PREFIX_rssId = "33";
public static final String CODE_PREFIX_pfId = "34";
+ public static final String CODE_PREFIX_ARDRID = "35";
+ public static final String CODE_PREFIX_csId = "36";
public static final String CODE_PREFIX_bankId = "74";
public static final String CODE_PREFIX_bondId = "76";
public static final String CODE_PREFIX_bobjId = "77";
@@ -220,8 +223,6 @@
public static final String CODE_PREFIX_formId = "80";
public static final String CODE_PREFIX_dataId = "81";
public static final String CODE_PREFIX_tranId = "82";
-
-
/**
@@ -279,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) {
@@ -289,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;
}
}
@@ -341,6 +348,19 @@
public static String getGeneratorId(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_H) + nextId("%04d");
+ }
+ //璋冪敤鏈嶅姟
+ 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);
@@ -980,9 +1000,9 @@
return result;
}
- public static String getUUID(){
+ public static String getUUID() {
UUID uuid = UUID.randomUUID();
- return uuid.toString();
+ return uuid.toString().replaceAll("-", "");
}
}
--
Gitblit v1.8.0