From 975fe5248cc1f3d999f4d660fc331570110c4968 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 13:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/redis/HrmNoRedisDAO.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/redis/HrmNoRedisDAO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/redis/HrmNoRedisDAO.java
index 44009fd..a934a53 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/redis/HrmNoRedisDAO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/redis/HrmNoRedisDAO.java
@@ -1,13 +1,9 @@
package cn.iocoder.yudao.module.hrm.dal.redis;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.common.util.number.BizNoUtils;
import jakarta.annotation.Resource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Repository;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
/**
* HRM 缂栧彿鐢熸垚鐨� Redis DAO
@@ -131,19 +127,23 @@
}
/**
- * 鐢熸垚缂栧彿
+ * 鐢熸垚 16 浣嶇函鏁板瓧涓氬姟缂栫爜锛堝叏绯荤粺鍞竴锛夈��
*
- * @param prefix 鍓嶇紑
- * @param digits 浣嶆暟
- * @return 缂栧彿
+ * <p>涓哄吋瀹规棦鏈夎皟鐢ㄦ柟锛屼繚鐣欏叆鍙傦紝浣嗕笉鍐嶅弬涓庣紪鐮佹嫾鎺ャ��
+ *
+ * @return 16 浣嶇函鏁板瓧缂栫爜
*/
public String generate(String prefix, int digits) {
- String noPrefix = prefix + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATE_PATTERN);
- String key = HrmRedisKeyConstants.NO + noPrefix;
- Long no = stringRedisTemplate.opsForValue().increment(key);
- // 璁剧疆杩囨湡鏃堕棿 1 澶�
- stringRedisTemplate.expire(key, Duration.ofDays(1L));
- return noPrefix + String.format("%0" + digits + "d", no);
+ // 鍏ㄧ郴缁熷叡鐢ㄥ悓涓�鑷搴忓垪锛屼繚璇佺紪鐮併��16 浣嶇函鏁板瓧銆嶄笖鍏ㄧ郴缁熷敮涓�
+ // 闅忔満鐢熸垚 16 浣嶇函鏁板瓧缂栫爜锛屽苟鐢� Redis 闆嗗悎鏌ラ噸锛屼繚璇佸叏绯荤粺鍞竴锛堜笉浣跨敤鑷/椤哄簭锛�
+ for (int i = 0; i < BizNoUtils.MAX_RETRY; i++) {
+ String code = BizNoUtils.randomCode();
+ Long added = stringRedisTemplate.opsForSet().add(BizNoUtils.USED_SET_KEY, code);
+ if (added != null && added > 0) {
+ return code;
+ }
+ }
+ throw new IllegalStateException("鐢熸垚鍞竴涓氬姟缂栫爜澶辫触锛岃閲嶈瘯");
}
}
--
Gitblit v1.9.3