From bcb1aaaadad892fe02e4de9a1fdb10cb99fea9bc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 12:01:46 +0800
Subject: [PATCH] Func工具类添加

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 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 fd6b38f..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
@@ -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;
@@ -40,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.*;
@@ -138,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);
 		}
@@ -483,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);
@@ -501,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);
@@ -1197,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);
 			}
@@ -1218,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));
@@ -1232,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);
@@ -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,7 +1568,7 @@
 				break;
 			}
 		}
-//		return UIContentDO2VO(context,true);
+		//return UIContentDO2VO(context,true);
 		return UIContentDO2VO(null,true);
 	}
 

--
Gitblit v1.9.3