From 6de65b0a180b377b36f23a6194a25e6d4de934ff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 12:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 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..0141b1b 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
@@ -39,6 +39,11 @@
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,10 @@
*/
@Override
@VciUnLog
- public UITableDefineVO tableDO2VO(com.vci.corba.portal.data.PortalVI portal, boolean queryDetail) {
+ public UITableDefineVO tableDO2VO(PortalVI portal, boolean queryDetail) {
+ if(null != null){
+
+ }
UITableDefineVO tableDefineVO = new UITableDefineVO();
tableDefineVO.setOid(portal.id);
tableDefineVO.setId(portal.viName);
@@ -1270,7 +1279,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 +1436,6 @@
}
}
-
-
/**
* 鎸夐挳鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param buttons 鎸夐挳鐨勬暟鎹璞�
@@ -1452,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);
@@ -1561,8 +1568,9 @@
break;
}
}
-// return UIContentDO2VO(context,true);
+ //return UIContentDO2VO(context,true);
return UIContentDO2VO(null,true);
}
+
}
--
Gitblit v1.9.3