From 6b48f5ac49de310c2e339b4e2fbfd2ccf42e1211 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 23 六月 2026 18:36:27 +0800
Subject: [PATCH] fix: 审批人出现重复问题
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index 3f9aeca..8256ad8 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -114,6 +114,49 @@
return redisTemplate.opsForValue().increment(key);
}
+ /**鏌ユ暟鎹簱
+ * 鑾峰彇鎸囧畾鏃ユ湡鍦ㄤ粖鏃ョ殑鏁板�硷紝骞惰嚜澧�1
+ * @return 鐩爣鏃ユ湡鑷鍚庣殑璁℃暟鍊�
+ */
+ public long incrementAndGetByDb(LocalDate targetDate) {
+ if (targetDate == null) {
+ targetDate = LocalDate.now();
+ }
+ String dateStr = targetDate.format(DATE_FORMAT);
+ String key = approvalNumberPrefix + ":approveNum:" + dateStr;
+ String lockKey = "lock:" + key;
+
+ if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+ Boolean acquired = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
+ if (Boolean.TRUE.equals(acquired)) {
+ try {
+ if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .likeRight(ApproveProcess::getApproveId, dateStr);
+ Long count = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+ long initialCount = (count == null) ? 0 : count;
+
+ redisTemplate.opsForValue().set(key, String.valueOf(initialCount), 24, TimeUnit.HOURS);
+ }
+ } finally {
+ // 閲婃斁閿�
+ redisTemplate.delete(lockKey);
+ }
+ } else {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ return incrementAndGetByDb(targetDate); // 閫掑綊閲嶈瘯
+ }
+ }
+
+ return redisTemplate.opsForValue().increment(key);
+ }
+
/**
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勫綋鍓嶆暟鍊�
* @param counterName 璁℃暟鍣ㄥ悕绉�
--
Gitblit v1.9.3