From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..0d4a3b4 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -4,10 +4,10 @@
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;
-import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@@ -26,6 +26,9 @@
public DailyRedisCounter(StringRedisTemplate redisTemplate) {
this.redisTemplate = redisTemplate;
}
+
+ @Value("${ruoyi.approvalNumberPrefix}")
+ private String approvalNumberPrefix;
/**鏌ョ紦瀛�
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
@@ -71,7 +74,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 +84,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