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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
index 13bd663..2e298cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.number.BizNoUtils;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.autocode.MesMdAutoCodePartDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.autocode.MesMdAutoCodeRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.autocode.MesMdAutoCodeRuleDO;
@@ -13,6 +14,7 @@
import cn.iocoder.yudao.module.mes.service.md.autocode.strategy.MesMdAutoCodePartStrategy;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -26,7 +28,7 @@
/**
* MES 缂栫爜鐢熸垚璁板綍 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -41,6 +43,9 @@
private MesMdAutoCodeRuleService ruleService;
@Resource
private MesMdAutoCodePartService partService;
+
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
@Resource
private List<MesMdAutoCodePartStrategy> strategyList;
@@ -93,23 +98,17 @@
*/
private String generateCode(MesMdAutoCodeRuleDO rule, List<MesMdAutoCodePartDO> parts,
MesMdAutoCodeContext context) {
- StringBuilder codeBuilder = new StringBuilder();
- for (MesMdAutoCodePartDO part : parts) {
- MesMdAutoCodePartStrategy strategy = strategyMap.get(part.getType());
- Assert.notNull(strategy, () -> exception(AUTO_CODE_GENERATE_FAILED));
- // 鐢熸垚鍒嗘缂栫爜
- String partCode = strategy.generate(part, context);
- // 缁熶竴鎴彇鎸囧畾闀垮害
- partCode = StrUtil.sub(partCode, 0, part.getLength());
- // 鎷兼帴鍒嗘缂栫爜
- codeBuilder.append(partCode);
+ // 闇�姹傦細鎵�鏈変笟鍔＄紪鐮佺粺涓�涓恒��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 result = codeBuilder.toString();
- if (Boolean.TRUE.equals(rule.getPadded()) && rule.getMaxLength() != null) {
- result = padCode(result, rule);
- }
- return result;
+ throw new IllegalStateException("鐢熸垚鍞竴涓氬姟缂栫爜澶辫触锛岃閲嶈瘯");
}
/**
--
Gitblit v1.9.3