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 | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 d50a4e1..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
@@ -1,7 +1,9 @@
package com.dy.sso.config;
+import com.dy.common.util.NumUtil;
import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.CacheManager;
import org.springframework.cache.caffeine.CaffeineCacheManager;
import org.springframework.context.annotation.Bean;
@@ -10,6 +12,15 @@
@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 ;
+
+ @Value("${pipIrr.sso.cacheDuration}")
+ private String cacheDuration ;
/*
initialCapacity=[integer]: 鍒濆鐨勭紦瀛樼┖闂村ぇ灏�
maximumSize=[long]: 缂撳瓨鐨勬渶澶ф潯鏁�
@@ -28,11 +39,23 @@
*/
@Bean
public CacheManager cacheManager() {
+ int cacheMaximumSizeInt;
+ int cacheDurationInt;
+ if(NumUtil.isPlusIntNumber(cacheMaximumSize)){
+ cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;
+ }else{
+ cacheMaximumSizeInt = cacheMaximumSizeDefault ;
+ }
+ if(NumUtil.isPlusIntNumber(cacheDuration)){
+ cacheDurationInt = Integer.parseInt(cacheDuration) ;
+ }else{
+ cacheDurationInt = cacheDurationDefault ;
+ }
CaffeineCacheManager cacheManager = new CaffeineCacheManager();
cacheManager.setCaffeine(Caffeine.newBuilder()
- .initialCapacity(10)
- .maximumSize(10000)
- .expireAfterAccess(30, TimeUnit.MINUTES));
+ .initialCapacity(cacheInitialCapacityDefault)
+ .maximumSize(cacheMaximumSizeInt)
+ .expireAfterAccess(cacheDurationInt, TimeUnit.MINUTES));
return cacheManager;
}
--
Gitblit v1.8.0