From 7a022cce2313827bc2525c1e2a5d762885f460b7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 11:03:40 +0800
Subject: [PATCH] yys  协同审批编号重复问题修复

---
 src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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);
         }
 

--
Gitblit v1.9.3