From 0ddbb4ec727ffce844ef672107e3410d84b1f11a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 30 九月 2026 09:42:08 +0800
Subject: [PATCH] feat: 业务编码改为随机16位数字并保证全系统唯一
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java | 50 +++++++++++++++-----------------------------------
1 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
index 2a14f51..1fe6485 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
@@ -1,16 +1,10 @@
package cn.iocoder.yudao.module.bpm.dal.redis;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.number.BizNoUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
import jakarta.annotation.Resource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Repository;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-
-import static cn.hutool.core.date.DatePattern.*;
/**
* BPM 娴佺▼ Id 缂栫爜鐨� Redis DAO
@@ -24,38 +18,24 @@
private StringRedisTemplate stringRedisTemplate;
/**
- * 鐢熸垚搴忓彿锛屼娇鐢ㄥ畾涔夌殑 processIdRule 瑙勫垯鐢熸垚
+ * 鐢熸垚 16 浣嶇函鏁板瓧涓氬姟缂栫爜锛堝叏绯荤粺鍞竴锛夈��
*
- * @param processIdRule 瑙勫垯
- * @return 搴忓彿
+ * <p>涓哄吋瀹规棦鏈夎皟鐢ㄦ柟锛屼繚鐣� {@code processIdRule} 鍏ュ弬锛屼絾涓嶅啀鍙備笌缂栫爜鎷兼帴銆�
+ *
+ * @param processIdRule 娴佺▼ Id 瑙勫垯锛堝凡涓嶅啀鍙備笌缂栫爜鎷兼帴锛�
+ * @return 16 浣嶇函鏁板瓧缂栫爜
*/
public String generate(BpmModelMetaInfoVO.ProcessIdRule processIdRule) {
- // 鐢熸垚鏃ユ湡鍓嶇紑
- String infix = "";
- switch (processIdRule.getInfix()) {
- case "DAY":
- infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN);
- break;
- case "HOUR":
- infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HH");
- break;
- case "MINUTE":
- infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HHmm");
- break;
- case "SECOND":
- infix = DateUtil.format(LocalDateTime.now(), PURE_DATETIME_PATTERN);
- break;
+ // 鍏ㄧ郴缁熷叡鐢ㄥ悓涓�鑷搴忓垪锛屼繚璇佺紪鐮併��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;
+ }
}
-
- // 鐢熸垚搴忓彿
- String noPrefix = processIdRule.getPrefix() + infix + processIdRule.getPostfix();
- String key = RedisKeyConstants.BPM_PROCESS_ID + noPrefix;
- Long no = stringRedisTemplate.opsForValue().increment(key);
- if (StrUtil.isEmpty(infix)) {
- // 鐗规畩锛氭病鏈夊墠缂�锛屽垯涓嶈兘杩囨湡锛屼笉鑳芥瘡娆￠兘鏄粠 0 寮�濮嬨�傚彲瑙� https://t.zsxq.com/MU1E2 璁ㄨ
- stringRedisTemplate.expire(key, Duration.ofDays(1L));
- }
- return noPrefix + String.format("%0" + processIdRule.getLength() + "d", no);
+ throw new IllegalStateException("鐢熸垚鍞竴涓氬姟缂栫爜澶辫触锛岃閲嶈瘯");
}
}
--
Gitblit v1.9.3