From 7664ba49025a6c549885fc6019e4d3c1886f45a6 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期五, 07 六月 2024 14:26:16 +0800
Subject: [PATCH] 调整项目BUG

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 9d6182c..6237182 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -14,7 +14,6 @@
 import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.starter.web.util.VciDateUtil;
 import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.CacheKeyConstant;
 import com.vci.web.enumpck.UIComponentDisplayTypeEnum;
 import com.vci.web.enumpck.UIComponentTypeEnum;
 import com.vci.web.enumpck.UIFieldTypeEnum;
@@ -33,9 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.Caching;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -43,7 +39,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
 import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
 
 /**
@@ -175,7 +170,6 @@
 	 * @return key鏄〃鍗曡嫳鏂囧悕绉�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_FORM,unless = "#result == null")
 	public Map<String, UIFormDefineVO> selectAllFormMap() {
 		return Optional.ofNullable(self.selectAllForm()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getBtmType().toLowerCase() + SEP + s.getId().toLowerCase(),t->t,(o1,o2)->o1));
 	}
@@ -404,7 +398,6 @@
 	 * @return 琛ㄥ崟鐨勫畾涔�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${formcache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 == null")
 	public UIFormDefineVO getFormById(String btmId, String id) {
 		if(StringUtils.isBlank(btmId) || StringUtils.isBlank(id)){
 			return null;
@@ -450,7 +443,6 @@
 	 * @return 琛ㄦ牸鐨勫畾涔�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_TABLE,unless = "#result == null")
 	@VciUnLog
 	public List<UITableDefineVO> selectAllTable() {
 		PortalVI[] portalVIS = null;
@@ -724,7 +716,6 @@
 	 * @return 琛ㄥ崟鐨勫畾涔�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${tablecache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 == null")
 	public UITableDefineVO getTableById(String btmId, String id) {
 		if(StringUtils.isBlank(btmId) || StringUtils.isBlank(id)){
 			return null;
@@ -786,7 +777,6 @@
 	 * @return 鏄剧ず瀵硅薄锛宬ey鏄痑ction鐨勪富閿�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key=CacheKeyConstant.ALL_ACTION,unless = "#result == null")
 	public Map<String, UIActionVO> selectAllActionMap() {
 		return Optional.ofNullable(self.selectAllAction()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t));
 	}
@@ -843,13 +833,6 @@
 	 * 娓呴櫎缂撳瓨
 	 */
 	@Override
-	@Caching(evict = {
-			@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_UI),
-			@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_ACTION),
-			@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_FORM),
-			@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_TABLE),
-			@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_FORM_AND_TABLE)
-	})
 	public void clearCache()  {
 
 	}
@@ -861,7 +844,6 @@
 	 */
 	@Override
 	@VciUnLog
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_UI,unless = "#result == null")
 	public List<UIContentVO> selectAllUIContent() {
 		try {
 			return UIContentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLUILayouts()).collect(Collectors.toList()));
@@ -1067,7 +1049,6 @@
 	 * @return 鍖哄煙鐨勬樉绀哄璞�
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_LAYOUT,unless = "#result == null")
 	public List<UILayoutVO> selectAllUILayout() {
 //		try {
 //			return UILayoutDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLTabPages()).collect(Collectors.toList()),true);
@@ -1173,7 +1154,6 @@
 	 * @return UI缁勪欢
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_COMP ,unless = "#result ==null")
 	public List<UIComponentVO> selectAllUIComponent() {
 //		try {
 //			return uiComponentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLPageDefinations()).collect(Collectors.toList()),false);
@@ -1542,7 +1522,6 @@
 	 * @return UI涓婁笅鏂囩殑淇℃伅
 	 */
 	@Override
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${uicache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 ==null")
 	public UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) {
 		WebUtil.alertNotNull(btmType,"涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�",id,"UI涓婁笅鏂囩殑缂栧彿");
 		PLUILayout[] obj = null;

--
Gitblit v1.9.3