From 083f3042f0a1bc628adfd9c91a7756af9cb0709c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 10:27:20 +0800
Subject: [PATCH] getDataForTree接口修改
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 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..47b838d 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;
@@ -39,6 +40,10 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import com.vci.corba.portal.data.PortalVI;
+import com.vci.corba.portal.data.PLAction;
+import com.vci.corba.portal.data.PLTabPage;
+import com.vci.corba.portal.data.PLTabButton;
import plm.corba.portal.*;
import java.util.*;
@@ -137,7 +142,8 @@
public void checkInvalidXmlVI() {
PortalVI[] portalVIS = null;
try {
- portalVIS = platformClientUtil.getPortalService().getAllPortalVI();
+ portalVIS = ServiceProvider.getUIService().getAllPortalVI();
+ // portalVIS = platformClientUtil.getPortalService().getAllPortalVI();
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -482,7 +488,7 @@
*/
@Override
@VciUnLog
- public List<UITableDefineVO> tableDO2VOs(Collection<com.vci.corba.portal.data.PortalVI> prms, boolean queryDetail) {
+ public List<UITableDefineVO> tableDO2VOs(Collection<PortalVI> prms, boolean queryDetail) {
List<UITableDefineVO> tableDefineVOList = new ArrayList<>();
Optional.ofNullable(prms).orElseGet(()->new ArrayList<com.vci.corba.portal.data.PortalVI>()).stream().forEach(portal->{
UITableDefineVO defineVO = tableDO2VO(portal,queryDetail);
@@ -500,7 +506,8 @@
*/
@Override
@VciUnLog
- public UITableDefineVO tableDO2VO(com.vci.corba.portal.data.PortalVI portal, boolean queryDetail) {
+ public UITableDefineVO tableDO2VO(PortalVI portal, boolean queryDetail) {
+
UITableDefineVO tableDefineVO = new UITableDefineVO();
tableDefineVO.setOid(portal.id);
tableDefineVO.setId(portal.viName);
@@ -799,7 +806,7 @@
*/
@Override
@VciUnLog
- public List<UIActionVO> actionDO2VOs(Collection<com.vci.corba.portal.data.PLAction> actions) {
+ public List<UIActionVO> actionDO2VOs(Collection<PLAction> actions) {
List<UIActionVO> actionVOS = new ArrayList<>();
Optional.ofNullable(actions).orElseGet(()->new ArrayList<>()).stream().forEach(action->{
UIActionVO actionVO = actionDO2VO(action);
@@ -816,7 +823,7 @@
*/
@Override
@VciUnLog
- public UIActionVO actionDO2VO(com.vci.corba.portal.data.PLAction action) {
+ public UIActionVO actionDO2VO(PLAction action) {
UIActionVO actionVO = new UIActionVO();
if(action!=null){
actionVO.setOid(action.plOId);
@@ -998,24 +1005,24 @@
return contentVO;
}
-// private List<UILayoutVO> swapLayArea(List<UILayoutVO> layoutVOS){
-// List<UILayoutVO> layoutVOList = new ArrayList<>();
-// //1 瀵艰埅鍖�
-// //2 涓诲唴瀹瑰尯
-// //3 椤电鍖�
-// if(!CollectionUtils.isEmpty(layoutVOS)){
-// //鍙湁涓�涓尯鍩熺殑鏃跺�欙紝閮芥斁鍦╟enter閲岋紝鍝�曟湰韬槸瀵艰埅鍖�
-// if(layoutVOS.size() == 1){
-// layoutVOS.get(0).setLayoutAreaType(UILayoutAreaTypeEnum.CENTER.getValue());
-// layoutVOList.add(layoutVOS.get(0));
-// }else{
-// Map<String,List<UILayoutVO>> layoutAreaMap = layoutVOS.stream().collect(Collectors.groupingBy(UILayoutVO::getLayoutAreaType));
-// if(layoutAreaMap.containsKey("1")){
-// //
-// }
-// }
-// }
-// }
+ // private List<UILayoutVO> swapLayArea(List<UILayoutVO> layoutVOS){
+ // List<UILayoutVO> layoutVOList = new ArrayList<>();
+ // //1 瀵艰埅鍖�
+ // //2 涓诲唴瀹瑰尯
+ // //3 椤电鍖�
+ // if(!CollectionUtils.isEmpty(layoutVOS)){
+ // //鍙湁涓�涓尯鍩熺殑鏃跺�欙紝閮芥斁鍦╟enter閲岋紝鍝�曟湰韬槸瀵艰埅鍖�
+ // if(layoutVOS.size() == 1){
+ // layoutVOS.get(0).setLayoutAreaType(UILayoutAreaTypeEnum.CENTER.getValue());
+ // layoutVOList.add(layoutVOS.get(0));
+ // }else{
+ // Map<String,List<UILayoutVO>> layoutAreaMap = layoutVOS.stream().collect(Collectors.groupingBy(UILayoutVO::getLayoutAreaType));
+ // if(layoutAreaMap.containsKey("1")){
+ // //
+ // }
+ // }
+ // }
+ // }
/**
* 鑾峰彇鏌愪釜UI涓婁笅鏂囩殑鍖哄煙
@@ -1082,9 +1089,9 @@
* @param pages 鍖哄煙鐨勬暟鎹璞�
* @return 鏄剧ず瀵硅薄
*/
- private List<UILayoutVO> UILayoutDO2VOs(Collection<com.vci.corba.portal.data.PLTabPage> pages, boolean queryDetail){
+ private List<UILayoutVO> UILayoutDO2VOs(Collection<PLTabPage> pages, boolean queryDetail){
List<UILayoutVO> contentVOS = new ArrayList<>();
- Optional.ofNullable(pages).orElseGet(()->new ArrayList<com.vci.corba.portal.data.PLTabPage>()).stream().forEach(page->{
+ Optional.ofNullable(pages).orElseGet(()->new ArrayList<PLTabPage>()).stream().forEach(page->{
UILayoutVO layoutVO = UILayoutDO2VO(page, queryDetail);
if(layoutVO.isEnableStatus()) {
contentVOS.add(layoutVO);
@@ -1108,7 +1115,7 @@
* @return 鍖哄煙鐨勬樉绀哄璞�
*/
@VciUnLog
- private UILayoutVO UILayoutDO2VO(com.vci.corba.portal.data.PLTabPage page, boolean queryDetail){
+ private UILayoutVO UILayoutDO2VO(PLTabPage page, boolean queryDetail){
UILayoutVO layoutVO = new UILayoutVO();
if(page !=null ){
layoutVO.setOid(page.plOId);
@@ -1196,8 +1203,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 +1224,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 +1238,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 +1278,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,15 +1435,13 @@
}
}
-
-
/**
* 鎸夐挳鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param buttons 鎸夐挳鐨勬暟鎹璞�
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<UIButtonDefineVO> buttonDO2VOs(Collection<com.vci.corba.portal.data.PLTabButton> buttons){
+ public List<UIButtonDefineVO> buttonDO2VOs(Collection<PLTabButton> buttons){
List<UIButtonDefineVO> buttonDefineVOS = new ArrayList<>();
Optional.ofNullable(buttons).orElseGet(()->new ArrayList<>()).stream().forEach(button->{
buttonDefineVOS.add(buttonDO2VO(button));
@@ -1564,5 +1570,6 @@
// return UIContentDO2VO(context,true);
return UIContentDO2VO(null,true);
}
+
}
--
Gitblit v1.9.3