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/controller/UIManagerController.java | 10 +++++++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java | 4 ++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java | 4 ++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 34 +++++++++++++++++++++++-----------
4 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
index 2db280d..8410035 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
+++ b/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);
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
index 5d4d16e..d686499 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
+++ b/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 = "鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑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 = "鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑tab鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -283,7 +287,7 @@
}
/***
- * @param selectTreeList 鍕鹃�夌殑闇�瑕佷繚瀛樼殑鏁版嵁瀵硅薄
+ * @param uiAuthorDTO 鍕鹃�夌殑闇�瑕佷繚瀛樼殑鏁版嵁瀵硅薄
* @return
*/
@PostMapping( "/authorizedUI")
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
index d1c1024..85c87d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
@@ -78,7 +78,7 @@
/**
* 鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑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;
/**
* 娣诲姞椤甸潰瀹氫箟
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 d843ddb..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
@@ -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 @@
* 鏍规嵁涓婁笅鏂嘔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;
}
/**
@@ -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;
}
/**
--
Gitblit v1.9.3