From 28cf22aaff7f092256db2ad6df699e17426f62ea Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 16:34:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..1d1466a 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -3,11 +3,11 @@
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 lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
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;
@@ -18,14 +18,14 @@
//鍩轰簬redis鐨勪竴涓瘡鏃ヨ鏁板櫒
@Component
+@RequiredArgsConstructor
public class DailyRedisCounter {
private static final String KEY_PREFIX = "daily_counter:";
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
private final StringRedisTemplate redisTemplate;
- public DailyRedisCounter(StringRedisTemplate redisTemplate) {
- this.redisTemplate = redisTemplate;
- }
+ @Value("${ruoyi.approvalNumberPrefix}")
+ private String approvalNumberPrefix;
/**鏌ョ紦瀛�
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
@@ -45,8 +45,7 @@
return count;
}
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
+ private final ApproveProcessMapper approveProcessMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿鐨� 寮�濮嬫棩鏈� 锛岀粨鏉熸棩鏈�
@@ -71,7 +70,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 +80,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