From 90b1100ca60cdc9e0ad03ae0607287b1a6fc4332 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 06 九月 2024 16:35:47 +0800 Subject: [PATCH] 调整业务类型查询模板导出接收参数形式 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java index ff8396d..3b63d43 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java @@ -1,8 +1,5 @@ package com.vci.web.service.impl; -import com.sun.jnlp.ApiDialog; -import com.vci.client.mw.ClientContextVariable; -import com.vci.common.qt.object.QTConstants; import com.vci.common.utility.ObjectUtility; import com.vci.corba.common.PLException; import com.vci.corba.framework.data.RoleRightInfo; @@ -12,7 +9,6 @@ import com.vci.dto.RoleRightDTO; import com.vci.dto.UIAuthorDTO; import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI; -import com.vci.pagemodel.OsBtmTypeVO; import com.vci.model.PLDefination; import com.vci.pagemodel.PLDefinationVO; import com.vci.pagemodel.PLUILayoutCloneVO; @@ -30,7 +26,6 @@ import com.vci.web.service.UIManagerServiceI; import com.vci.web.util.*; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import com.vci.web.util.Func; import com.vci.web.util.PlatformClientUtil; import com.vci.web.util.UITools; @@ -40,18 +35,12 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import javax.swing.*; -import javax.swing.text.JTextComponent; import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.*; import java.util.regex.Pattern; -import java.util.stream.Collectors; /** * UI瀹氫箟鏈嶅姟鐣岄潰鐩稿叧鎺ュ彛 @@ -66,12 +55,6 @@ */ @Resource private PlatformClientUtil platformClientUtil; - - /** - * 瑙掕壊 - */ - @Resource - private SmRoleQueryServiceI smRoleQueryServiceI; /** * 涓氬姟绫诲瀷 @@ -91,6 +74,16 @@ @Override public int compare(PLUILayout o1, PLUILayout o2) { return o1.plCode.compareTo(o2.plCode); + } + }; + + /** + * 鎺掑簭姣旇緝鍣� + */ + private Comparator<PLPageDefination> pageDefinationComparator = new Comparator<PLPageDefination>() { + @Override + public int compare(PLPageDefination o1, PLPageDefination o2) { + return new Integer(o1.seq).compareTo(new Integer(o2.seq)); } }; @@ -336,10 +329,13 @@ * 鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑tab椤� */ @Override - public List<PLTabPage> getTabByContextIdAndType(String contextId, int areaType) throws PLException { + public DataGrid getTabByContextIdAndType(String contextId, int areaType) throws PLException { VciBaseUtil.alertNotNull(contextId,"涓婁笅鏂囦富閿�",areaType,"鍖哄煙绫诲瀷"); PLTabPage[] plTabPages = platformClientUtil.getUIService().getTabPagesByContextIdAndType(contextId, (short) areaType); - return Arrays.asList(plTabPages); + DataGrid dataGrid = new DataGrid(); + dataGrid.setTotal(plTabPages.length); + dataGrid.setData(Arrays.asList(plTabPages)); + return dataGrid; } /** @@ -405,9 +401,15 @@ * @return */ @Override - public List<PLPageDefination> getPLPageDefinations(String plPageContextOId) { + public DataGrid getPLPageDefinations(String plPageContextOId) throws PLException { + DataGrid dataGrid = new DataGrid(); + if(Func.isBlank(plPageContextOId)) return dataGrid; + PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(plPageContextOId); - return null; + dataGrid.setTotal(plPageDefinations.length); + Arrays.sort(plPageDefinations, pageDefinationComparator); + dataGrid.setData(Arrays.asList(plPageDefinations)); + return dataGrid; } /** -- Gitblit v1.9.3