From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 16 一月 2025 16:19:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java index 40b4ec7..f56b887 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java @@ -1,9 +1,10 @@ package com.vci.web.service; +import com.vci.corba.common.PLException; +import com.vci.corba.portal.data.PLAction; import com.vci.corba.portal.data.PLTabButton; import com.vci.corba.portal.data.PLUILayout; import com.vci.corba.portal.data.PortalVI; -import com.vci.corba.portal.data.PLAction; import com.vci.pagemodel.*; import java.util.Collection; @@ -90,7 +91,7 @@ * @param queryDetail 鏌ヨ鏄庣粏 * @return 鏄剧ず瀵硅薄 */ - UITableDefineVO tableDO2VO(PortalVI prm,boolean queryDetail); + UITableDefineVO tableDO2VO(PortalVI prm, boolean queryDetail, Map<String, OsAttributeVO> attributeVOMap) throws PLException; /** * 浣跨敤琛ㄦ牸鐨勮嫳鏂囧悕绉拌幏鍙栬〃鍗� @@ -98,7 +99,7 @@ * @param btmId 涓氬姟绫诲瀷 * @return 琛ㄥ崟鐨勫畾涔� */ - UITableDefineVO getTableById(String btmId,String id); + UITableDefineVO getTableById(String btmId,String id) throws PLException; /** * 浣跨敤琛ㄦ牸鐨勮嫳鏂囧悕绉拌幏鍙栬〃鍗� @@ -169,14 +170,14 @@ * @param componentOid 缁勪欢鐨勪富閿� * @return 涓婚敭鐨勬樉绀哄璞� */ - UIComponentVO getComponentByOid(String componentOid); + UIComponentVO getComponentByOid(String componentOid, Map<String, OsAttributeVO> attributeVOMap); /** * 鑾峰彇鏌愪釜缁勪欢鐨勬寜閽� * @param pkComponent 缁勪欢鐨勪富閿� * @return 鎸夐挳鐨勪俊鎭� */ - List<UIButtonDefineVO> listButtonByComponent(String pkComponent); + List<UIButtonDefineVO> listButtonByComponent(String pkComponent, Map<String, List<RoleRightVO>> roleRightMap); /** * 鎸夐挳鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄 @@ -190,7 +191,7 @@ * @param button 鎸夐挳鐨勬暟鎹璞� * @return 鏄剧ず瀵硅薄 */ - UIButtonDefineVO buttonDO2VO(PLTabButton button) ; + UIButtonDefineVO buttonDO2VO(PLTabButton button,Map<String, UIActionVO> actionVOMap) ; /** * 鏌ヨ鎵�鏈夌殑缁勪欢 @@ -204,9 +205,10 @@ * @param id 涓婚敭 * @return UI涓婁笅鏂囩殑淇℃伅 */ - UIContentVO getUIContentByBtmTypeAndId(String btmType, String id); + UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) throws PLException; -// UIContentVO UIContentDO2VO(PLPageLayoutDefination pageLayoutDefination, boolean queryDetail); - UIContentVO UIContentDO2VO(PLUILayout pageLayoutDefination, boolean queryDetail); + // UIContentVO UIContentDO2VO(PLPageLayoutDefination pageLayoutDefination, boolean queryDetail); + + UIContentVO UIContentDO2VO(PLUILayout pageLayoutDefination, boolean queryDetail,Map<String, List<RoleRightVO>> roleRightMap); } -- Gitblit v1.9.3