From 39e49bdfab3d77951f2a9b22f84a22d7980de8b7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 四月 2021 15:54:33 +0800
Subject: [PATCH] 1、新增物品类型表可维护物品类型2、新增物品的出入库操作 无需进行走申请流程3、部分查询条件优化
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 076994f..05aca90 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
@@ -186,7 +186,13 @@
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";
/**
@@ -304,6 +310,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");
}
@@ -489,7 +537,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("agentId"));
}
-
/**
* 鑾峰彇灏忓尯鐓х墖ID
@@ -825,7 +872,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("pgId"));
}
-
/**
* 鑾峰彇restTemplate
--
Gitblit v1.8.0