From c2528fee65fa17a7434eb16deb782fd7c4e71523 Mon Sep 17 00:00:00 2001
From: his-uncles-father <88386378@qq.com>
Date: 星期二, 06 四月 2021 14:47:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 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 25d3f10..c8f9998 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
@@ -179,6 +179,16 @@
public static final String CODE_PREFIX_ardId = "14";
public static final String CODE_PREFIX_applyType = "15";
public static final String CODE_PREFIX_classesId = "16";
+ public static final String CODE_PREFIX_rId = "17";
+ 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";
/**
@@ -296,6 +306,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");
}
@@ -481,7 +533,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("agentId"));
}
-
/**
* 鑾峰彇灏忓尯鐓х墖ID
@@ -817,7 +868,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("pgId"));
}
-
/**
* 鑾峰彇restTemplate
--
Gitblit v1.8.0