From eb85010d75785fc759d398ab32f7ce588e388688 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 13 六月 2024 17:47:41 +0800
Subject: [PATCH] 1、文件上传接口修改 2、平台接口修改。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index 58977d3..8854856 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -1,7 +1,7 @@
 package com.vci.frameworkcore.compatibility.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.vci.client.common.providers.ServiceProvider;
+import com.vci.client.common.providers.ClientServiceProvider;
 import com.vci.corba.common.PLException;
 import com.vci.corba.framework.data.FunctionInfo;
 import com.vci.corba.portal.data.PLUILayout;
@@ -23,17 +23,12 @@
 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.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
-import static com.vci.web.constant.CacheKeyConstant.ALL_FUNCTION;
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
 
 /**
  * 鑰佸钩鍙扮殑鏉冮檺鏈嶅姟
@@ -94,7 +89,6 @@
      * @return 鍔熻兘鐨勬樉绀哄璞�
      */
     @Override
-    @Cacheable(value = VCI_OBJECT_SERVICE,key = ALL_FUNCTION,unless = "#result == null")
     public Map<String, SmFunctionVO> selectAllFunctionMap() {
         return Optional.ofNullable(self.selectAllFunction()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t));
     }
@@ -246,7 +240,7 @@
         }
 //        PortalServicePrx uiService = ServiceProvider.getUIService();
 //        FrameworkServicePrx frameService = ServiceProvider.getFrameService();
-        FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
+        FunctionInfo[] menus = ClientServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
 //        FunctionInfo[] menus = ServiceProvider.getFrameService().("modelManagmentNode", true);
 
 //        PLAction[] allPLAction = uiService.getAllPLAction();
@@ -289,7 +283,7 @@
     }
 
     public List<MenuVO> findChildFunctionVO(String parentOid) throws PLException {
-        FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId(parentOid, true);
+        FunctionInfo[] menus = ClientServiceProvider.getFrameService().getModuleListByParentId(parentOid, true);
         List<MenuVO> functionVOList = new ArrayList<>();
         for (FunctionInfo menu : menus) {
             if(!menu.isValid){
@@ -336,7 +330,7 @@
         if(resourceControlTypeEnum == null){
             resourceControlTypeEnum = ResourceControlTypeEnum.BS;
         }
-        for (PLUILayout allPLUILayout : ServiceProvider.getUIService().getAllPLUILayouts()) {
+        for (PLUILayout allPLUILayout : ClientServiceProvider.getUIService().getAllPLUILayouts()) {
             if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
                     && treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
                 return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
@@ -678,7 +672,6 @@
      * 娓呴櫎缂撳瓨
      */
     @Override
-    @CacheEvict(value = VCI_OBJECT_SERVICE,key = ALL_FUNCTION)
     public void clearCache() {
 
     }

--
Gitblit v1.9.3