From dfdfa6b8ecdfabbe48ff82b595e759f9fab94991 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 07 四月 2024 18:22:54 +0800
Subject: [PATCH] getDataForTree接口修改
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 15 ++++++++-------
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java | 1 -
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 4bfe77d..fd6b38f 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
+import com.vci.corba.portal.data.PLPageDefination;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
@@ -1196,8 +1197,9 @@
}
if(!QUERY_BY_CACHE){
try {
- platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
- return uiComponentDO2VO(null,true);
+ PLPageDefination plPageDefination = ServiceProvider.getUIService().getPLPageDefinationById(componentOid);
+ // PLPageDefination plPageDefination = platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
+ return uiComponentDO2VO(plPageDefination,true);
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1216,7 +1218,7 @@
* @param pages 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
+ private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
List<UIComponentVO> componentVOS = new ArrayList<>();
pages.stream().forEach(page->{
componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1230,7 +1232,7 @@
* @return 鏄剧ず瀵硅薄
*/
@VciUnLog
- private UIComponentVO uiComponentDO2VO(com.vci.corba.portal.data.PLPageDefination page, boolean queryDetail){
+ private UIComponentVO uiComponentDO2VO(PLPageDefination page, boolean queryDetail){
UIComponentVO componentVO = new UIComponentVO();
if(page !=null){
componentVO.setOid(page.plOId);
@@ -1270,7 +1272,7 @@
}else{
try {
componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
-// componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
+ //componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1427,8 +1429,6 @@
}
}
-
-
/**
* 鎸夐挳鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param buttons 鎸夐挳鐨勬暟鎹璞�
@@ -1564,5 +1564,6 @@
// return UIContentDO2VO(context,true);
return UIContentDO2VO(null,true);
}
+
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
index 3abe20b..fff6644 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
@@ -105,7 +105,6 @@
return BOFactoryServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BO_FACTORY_SERVICE_NAME));
}
-
/**
* 鑾峰彇鐧诲綍涓绘湇鍔�
* @return 鏈嶅姟鐨勫璞�
--
Gitblit v1.9.3