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 |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 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 109e71e..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";
@@ -200,6 +201,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_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";
+    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";
 
 
     /**
@@ -257,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) {
@@ -267,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;
         }
     }
 
@@ -319,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);
@@ -958,5 +1000,9 @@
         return result;
     }
 
+    public static String getUUID() {
+        UUID uuid = UUID.randomUUID();
+        return uuid.toString().replaceAll("-", "");
+    }
 
 }

--
Gitblit v1.8.0