From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
index 8a705f2..1c85166 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
@@ -12,6 +12,9 @@
@Configuration
public class CaffeineCacheConfiguration {
+ private static final int cacheInitialCapacityDefault = 10 ;
+ private static final int cacheMaximumSizeDefault = 10000 ;
+ private static final int cacheDurationDefault = 720 ;
@Value("${pipIrr.sso.cacheMaximumSize}")
private String cacheMaximumSize ;
@@ -36,17 +39,21 @@
*/
@Bean
public CacheManager cacheManager() {
- int cacheMaximumSizeInt = 10000 ;
- int cacheDurationInt = 720 ;
+ int cacheMaximumSizeInt;
+ int cacheDurationInt;
if(NumUtil.isPlusIntNumber(cacheMaximumSize)){
- cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;//
+ cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;
+ }else{
+ cacheMaximumSizeInt = cacheMaximumSizeDefault ;
}
if(NumUtil.isPlusIntNumber(cacheDuration)){
- cacheDurationInt = Integer.parseInt(cacheDuration) ;//
+ cacheDurationInt = Integer.parseInt(cacheDuration) ;
+ }else{
+ cacheDurationInt = cacheDurationDefault ;
}
CaffeineCacheManager cacheManager = new CaffeineCacheManager();
cacheManager.setCaffeine(Caffeine.newBuilder()
- .initialCapacity(10)
+ .initialCapacity(cacheInitialCapacityDefault)
.maximumSize(cacheMaximumSizeInt)
.expireAfterAccess(cacheDurationInt, TimeUnit.MINUTES));
--
Gitblit v1.8.0