From 23c9ac66c445d5256b6e20a41a29a74fb50aae57 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 七月 2024 15:35:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index cafde0d..4adf929 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
@@ -4,21 +4,17 @@
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.CacheKeyConstant;
-import com.vci.web.pageModel.OsRevisionRuleVO;
+import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.web.service.OsRevisionRuleServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
-
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
/**
* 鐗堟湰瑙勫垯鐨勬湇鍔�
@@ -60,7 +56,6 @@
* @return key 鏄増鏈殑鑻辨枃鍚嶇О
*/
@Override
- @CachePut(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_REVISION,unless = "#result ==null ")
@VciUnLog
public Map<String, OsRevisionRuleVO> selectAllRevisionMap() {
return Optional.ofNullable(self.selectAllRevision()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId().toLowerCase(),t->t,(o1,o2)->o1));
@@ -133,7 +128,6 @@
* 娓呴櫎缂撳瓨
*/
@Override
- @CachePut(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_REVISION)
public void clearCache() {
}
--
Gitblit v1.9.3