From 61ced6bdf40951b41a1cd70d8f7440961d117cb1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 11:42:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 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 4a69509..e5d8d37 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,7 +6,6 @@
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;
@@ -44,6 +43,7 @@
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.*;
@@ -507,7 +507,7 @@
@Override
@VciUnLog
public UITableDefineVO tableDO2VO(PortalVI portal, boolean queryDetail) {
- if(){
+ if(null != null){
}
UITableDefineVO tableDefineVO = new UITableDefineVO();
@@ -808,7 +808,7 @@
*/
@Override
@VciUnLog
- public List<UIActionVO> actionDO2VOs(Collection<PLAction> actions) {
+ public List<UIActionVO> actionDO2VOs(Collection<com.vci.corba.portal.data.PLAction> actions) {
List<UIActionVO> actionVOS = new ArrayList<>();
Optional.ofNullable(actions).orElseGet(()->new ArrayList<>()).stream().forEach(action->{
UIActionVO actionVO = actionDO2VO(action);
@@ -825,7 +825,7 @@
*/
@Override
@VciUnLog
- public UIActionVO actionDO2VO(PLAction action) {
+ public UIActionVO actionDO2VO(com.vci.corba.portal.data.PLAction action) {
UIActionVO actionVO = new UIActionVO();
if(action!=null){
actionVO.setOid(action.plOId);
@@ -1007,24 +1007,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涓婁笅鏂囩殑鍖哄煙
@@ -1091,9 +1091,9 @@
* @param pages 鍖哄煙鐨勬暟鎹璞�
* @return 鏄剧ず瀵硅薄
*/
- private List<UILayoutVO> UILayoutDO2VOs(Collection<PLTabPage> pages, boolean queryDetail){
+ private List<UILayoutVO> UILayoutDO2VOs(Collection<com.vci.corba.portal.data.PLTabPage> pages, boolean queryDetail){
List<UILayoutVO> contentVOS = new ArrayList<>();
- Optional.ofNullable(pages).orElseGet(()->new ArrayList<PLTabPage>()).stream().forEach(page->{
+ Optional.ofNullable(pages).orElseGet(()->new ArrayList<com.vci.corba.portal.data.PLTabPage>()).stream().forEach(page->{
UILayoutVO layoutVO = UILayoutDO2VO(page, queryDetail);
if(layoutVO.isEnableStatus()) {
contentVOS.add(layoutVO);
@@ -1117,7 +1117,7 @@
* @return 鍖哄煙鐨勬樉绀哄璞�
*/
@VciUnLog
- private UILayoutVO UILayoutDO2VO(PLTabPage page, boolean queryDetail){
+ private UILayoutVO UILayoutDO2VO(com.vci.corba.portal.data.PLTabPage page, boolean queryDetail){
UILayoutVO layoutVO = new UILayoutVO();
if(page !=null ){
layoutVO.setOid(page.plOId);
@@ -1205,9 +1205,8 @@
}
if(!QUERY_BY_CACHE){
try {
- PLPageDefination plPageDefination = ServiceProvider.getUIService().getPLPageDefinationById(componentOid);
- // PLPageDefination plPageDefination = platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
- return uiComponentDO2VO(plPageDefination,true);
+ platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
+ return uiComponentDO2VO(null,true);
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1226,7 +1225,7 @@
* @param pages 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
+ private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
List<UIComponentVO> componentVOS = new ArrayList<>();
pages.stream().forEach(page->{
componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1240,7 +1239,7 @@
* @return 鏄剧ず瀵硅薄
*/
@VciUnLog
- private UIComponentVO uiComponentDO2VO(PLPageDefination page, boolean queryDetail){
+ private UIComponentVO uiComponentDO2VO(com.vci.corba.portal.data.PLPageDefination page, boolean queryDetail){
UIComponentVO componentVO = new UIComponentVO();
if(page !=null){
componentVO.setOid(page.plOId);
@@ -1277,7 +1276,6 @@
throw new VciBaseException("{0}閲岀殑琛ㄦ牸{1}涓嶅瓨鍦�", new String[]{btmType, componentDefineXO.getTemplateId()});
}
componentVO.setTableDefineVO(tableDefineVOMap.get(key));
-
}else{
try {
componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
@@ -1444,7 +1442,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<UIButtonDefineVO> buttonDO2VOs(Collection<PLTabButton> buttons){
+ public List<UIButtonDefineVO> buttonDO2VOs(Collection<com.vci.corba.portal.data.PLTabButton> buttons){
List<UIButtonDefineVO> buttonDefineVOS = new ArrayList<>();
Optional.ofNullable(buttons).orElseGet(()->new ArrayList<>()).stream().forEach(button->{
buttonDefineVOS.add(buttonDO2VO(button));
@@ -1461,7 +1459,7 @@
public UIButtonDefineVO buttonDO2VO(com.vci.corba.portal.data.PLTabButton button) {
UIButtonDefineVO buttonVO = new UIButtonDefineVO();
Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
-// Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
+ //Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
if(button !=null){
buttonVO.setOid(button.plOId);
buttonVO.setPkComponent(button.plTableOId);
@@ -1570,9 +1568,8 @@
break;
}
}
-// return UIContentDO2VO(context,true);
+ //return UIContentDO2VO(context,true);
return UIContentDO2VO(null,true);
}
-
}
--
Gitblit v1.9.3