From bda2d004876498d1618a8a6e5fa0363e19d5c011 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 01 四月 2026 11:37:52 +0800
Subject: [PATCH] fix(approve): 优化审批计数器的自增逻辑
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index 0fdcfc5..13acef2 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -71,15 +71,33 @@
* @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
*/
public long incrementAndGetByDb() {
- StartAndEndDateDto dateTime = getDateTime();
- LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveProcessLambdaQueryWrapper
- .eq(ApproveProcess::getApproveDelete,0)
- .gt(ApproveProcess::getCreateTime,dateTime.getStartDate())
- .lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
- Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+ String key = "approveNumHSXNY";
- return aLong == null ? 1 : aLong + 1;
+ // 1. 鍏堝皾璇曚粠 Redis 鑷锛堝師瀛愭搷浣滐級
+ Long num = redisTemplate.opsForValue().increment(key);
+
+ // 2. 濡傛灉鏄涓�娆★紙璇存槑 key 涓嶅瓨鍦級
+ if (num == null || num == 1L) {
+
+ // 鏌ヨ鏁版嵁搴撳綋鍓嶆渶澶у�硷紙鏇村悎鐞嗭級
+ StartAndEndDateDto dateTime = getDateTime();
+
+ LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ApproveProcess::getApproveDelete, 0)
+ .ge(ApproveProcess::getCreateTime, dateTime.getStartDate())
+ .lt(ApproveProcess::getCreateTime, dateTime.getEndDate());
+
+ Long count = approveProcessMapper.selectCount(wrapper);
+
+ long start = (count == null ? 0 : count) + 1;
+
+ // 璁剧疆鍒濆鍊硷紙閬垮厤瑕嗙洊骞跺彂锛�
+ redisTemplate.opsForValue().set(key, String.valueOf(start), 1L, TimeUnit.HOURS);
+
+ return start;
+ }
+
+ return num;
}
/**
--
Gitblit v1.9.3