From fbcede1d8f108b5084e86a74b92da93d01eb699c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:43 +0800
Subject: [PATCH] yys 协同审批编号重复问题修复
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 12 ++++++++----
src/main/resources/application-new.yml | 3 ++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index d98a005..f1348db 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -4,6 +4,7 @@
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
@@ -26,6 +27,9 @@
public DailyRedisCounter(StringRedisTemplate redisTemplate) {
this.redisTemplate = redisTemplate;
}
+
+ @Value("${ruoyi.approvalNumberPrefix}")
+ private String approvalNumberPrefix;
/**鏌ョ紦瀛�
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
@@ -71,7 +75,7 @@
* @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
*/
public long incrementAndGetByDb() {
- String approveId = redisTemplate.opsForValue().get("approveNum");
+ String approveId = redisTemplate.opsForValue().get(approvalNumberPrefix + ":approveNum");
if(approveId == null){
StartAndEndDateDto dateTime = getDateTime();
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -81,16 +85,16 @@
.lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
if(aLong == null){
- redisTemplate.opsForValue().set("approveNum","1",1L, TimeUnit.HOURS);
+ redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum","1",1L, TimeUnit.HOURS);
return 1;
}else{
aLong += 1;
- redisTemplate.opsForValue().set("approveNum",aLong.toString(),1L, TimeUnit.HOURS);
+ redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum",aLong.toString(),1L, TimeUnit.HOURS);
return aLong;
}
}else{
Long num = Long.parseLong(approveId) + 1;
- redisTemplate.opsForValue().set("approveNum",num.toString(),1L, TimeUnit.HOURS);
+ redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum",num.toString(),1L, TimeUnit.HOURS);
return Long.parseLong(approveId);
}
diff --git a/src/main/resources/application-new.yml b/src/main/resources/application-new.yml
index d882b7d..47f7ecd 100644
--- a/src/main/resources/application-new.yml
+++ b/src/main/resources/application-new.yml
@@ -13,7 +13,8 @@
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
-
+ # 鍗忓悓瀹℃壒缂栧彿鍓嶇紑(閰嶇疆鏂囦欢鍚庣紑鍛藉悕)
+ approvalNumberPrefix: NEW
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
--
Gitblit v1.9.3