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 | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index eec0e4a..13acef2 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -1,12 +1,18 @@
package com.ruoyi.approve.utils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.approve.mapper.ApproveProcessMapper;
+import com.ruoyi.approve.pojo.ApproveProcess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
import java.util.concurrent.TimeUnit;
@@ -21,7 +27,7 @@
this.redisTemplate = redisTemplate;
}
- /**
+ /**鏌ョ紦瀛�
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
* @param counterName 璁℃暟鍣ㄥ悕绉帮紙渚嬪锛歭ogin_count銆乷rder_count锛�
* @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
@@ -39,6 +45,61 @@
return count;
}
+ @Autowired
+ private ApproveProcessMapper approveProcessMapper;
+
+ /**
+ * 鑾峰彇褰撳墠鏃堕棿鐨� 寮�濮嬫棩鏈� 锛岀粨鏉熸棩鏈�
+ * @return
+ */
+ public static StartAndEndDateDto getDateTime(){
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = new Date();
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.DATE,1);
+ String startDateTime = simpleDateFormat.format(date);
+ String endDateTime = simpleDateFormat.format(cal.getTime());
+ StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
+ startAndEndDateDto.setStartDate(startDateTime);
+ startAndEndDateDto.setEndDate(endDateTime);
+ return startAndEndDateDto;
+ }
+
+ /**鏌ユ暟鎹簱
+ * 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
+ * @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
+ */
+ public long incrementAndGetByDb() {
+ String key = "approveNumHSXNY";
+
+ // 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;
+ }
+
/**
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勫綋鍓嶆暟鍊�
* @param counterName 璁℃暟鍣ㄥ悕绉�
--
Gitblit v1.9.3