Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
@@ -353,8 +353,8 @@ * @return */ @PostMapping("/expBtmQTTemplate") public void expBtmQTTemplate(@RequestBody List<String> names,HttpServletResponse response) throws PLException, IOException { quereyTemplateServiceI.expBtmQTTemplate(names, response); public void expBtmQTTemplate(List<String> qtNames,HttpServletResponse response) throws PLException, IOException { quereyTemplateServiceI.expBtmQTTemplate(qtNames, response); } /** Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
@@ -1,6 +1,7 @@ package com.vci.web.controller; import com.vci.corba.common.PLException; import com.vci.corba.portal.data.PLPageDefination; import com.vci.corba.portal.data.PLTabPage; import com.vci.corba.portal.data.PLUILayout; import com.vci.dto.UIAuthorDTO; @@ -9,6 +10,7 @@ import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.BaseQueryObject; import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.DataGrid; import com.vci.starter.web.util.VciBaseUtil; import com.vci.web.service.OsBtmServiceI; import com.vci.web.service.UIManagerServiceI; @@ -19,7 +21,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.xml.crypto.Data; import java.io.IOException; import java.util.Comparator; import java.util.List; /** @@ -185,9 +189,9 @@ */ @GetMapping( "/getTabByContextIdAndType") @VciBusinessLog(operateName = "根据上下文ID和区域类型,按顺序获取当前区域的tab页") public BaseResult<List<PLTabPage>> getTabByContextIdAndType(String contextId, int areaType){ public BaseResult<DataGrid> getTabByContextIdAndType(String contextId, int areaType){ try { return BaseResult.dataList(uiManagerService.getTabByContextIdAndType(contextId,areaType)); return BaseResult.dataGrid(uiManagerService.getTabByContextIdAndType(contextId,areaType)); }catch (Exception e) { e.printStackTrace(); String exceptionMessage = "根据上下文ID和区域类型,按顺序获取当前区域的tab时出现错误,原因:" + VciBaseUtil.getExceptionMessage(e); @@ -283,7 +287,7 @@ } /*** * @param selectTreeList 勾选的需要保存的数据对象 * @param uiAuthorDTO 勾选的需要保存的数据对象 * @return */ @PostMapping( "/authorizedUI") Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
@@ -78,7 +78,7 @@ /** * 根据上下文ID和区域类型,按顺序获取当前区域的tab页 */ List<PLTabPage> getTabByContextIdAndType(String contextId, int areaType) throws PLException; DataGrid getTabByContextIdAndType(String contextId, int areaType) throws PLException; /** * 添加区域数据 @@ -114,7 +114,7 @@ * @param plPageContextOId * @return */ List<PLPageDefination> getPLPageDefinations(String plPageContextOId); DataGrid getPLPageDefinations(String plPageContextOId) throws PLException; /** * 添加页面定义 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -35,7 +35,6 @@ 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 java.io.IOException; @@ -58,12 +57,6 @@ private PlatformClientUtil platformClientUtil; /** * 角色 */ @Resource private SmRoleQueryServiceI smRoleQueryServiceI; /** * 业务类型 */ @Resource @@ -81,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)); } }; @@ -326,10 +329,13 @@ * 根据上下文ID和区域类型,按顺序获取当前区域的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; } /** @@ -395,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; } /**