From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 86 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 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 5f3bcab..19fc6b4 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
@@ -146,6 +146,8 @@
public static final String CODE_PREFIX_appointmentId = "80";
public static final String CODE_PREFIX_contractId = "81";
public static final String CODE_PREFIX_contractTypeId = "81";
+ public static final String CODE_PREFIX_contractFileId = "89";
+
public static final String CODE_PREFIX_specCd = "82";
public static final String CODE_PREFIX_loginId = "82";
public static final String CODE_PREFIX_templateId = "82";
@@ -183,6 +185,42 @@
public static final String CODE_PREFIX_qaId = "18";
public static final String CODE_PREFIX_titleId = "19";
public static final String CODE_PREFIX_userQaId = "20";
+ public static final String CODE_PREFIX_userTitleId = "21";
+ public static final String CODE_PREFIX_beId = "22";
+ public static final String CODE_PREFIX_collectionId = "23";
+ public static final String CODE_PREFIX_authId = "23";
+ public static final String CODE_PREFIX_planId = "24";
+ public static final String CODE_PREFIX_visitId = "24";
+ public static final String CODE_PREFIX_shId = "25";
+ public static final String CODE_PREFIX_allocationStorehouseId = "26";
+ public static final String CODE_PREFIX_usId = "27";
+ public static final String CODE_PREFIX_rstId = "28";
+ public static final String CODE_PREFIX_crId = "28";
+ public static final String CODE_PREFIX_partyaId = "28";
+ public static final String CODE_PREFIX_rsId = "29";
+ public static final String CODE_PREFIX_ausId = "29";
+ public static final String CODE_PREFIX_rsurId = "30";
+ public static final String CODE_PREFIX_applyId = "29";
+ public static final String CODE_PREFIX_prId = "30";
+ public static final String CODE_PREFIX_acctId = "31";
+ 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_bankId = "74";
+ public static final String CODE_PREFIX_bondId = "76";
+ public static final String CODE_PREFIX_bobjId = "77";
+ public static final String CODE_PREFIX_smsId = "78";
+ public static final String CODE_PREFIX_adsId = "78";
+ public static final String CODE_PREFIX_userAnId = "88";
+ public static final String CODE_PREFIX_anValueId = "68";
+
+ public static final String CODE_PREFIX_backId = "78";
+ public static final String CODE_PREFIX_monthId = "79";
+ public static final String CODE_PREFIX_xmlId = "79";
+ public static final String CODE_PREFIX_formId = "80";
+ public static final String CODE_PREFIX_dataId = "81";
+ public static final String CODE_PREFIX_tranId = "82";
/**
@@ -300,6 +338,48 @@
* @throws GenerateCodeException
*/
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);
+ }
+
+ /**
+ * 鑾峰彇杞︿綅ID
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getPsId(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);
+ }
+
+ /**
+ * 鑾峰彇璧勬簮ID
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getResId(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);
+ }
+
+ /**
+ * 鐢熸垚璐圭敤id
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getFeeId(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");
}
@@ -485,7 +565,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("agentId"));
}
-
/**
* 鑾峰彇灏忓尯鐓х墖ID
@@ -822,7 +901,6 @@
return getCode(prefixMap.get("pgId"));
}
-
/**
* 鑾峰彇restTemplate
*
@@ -901,5 +979,9 @@
return result;
}
+ public static String getUUID() {
+ UUID uuid = UUID.randomUUID();
+ return uuid.toString().replaceAll("-", "");
+ }
}
--
Gitblit v1.8.0