From 3be6b8a0b31b780f626724691fcb304de3b7d9f2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 06 九月 2024 17:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
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 324c57f..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,15 +1,16 @@
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.OsBtmTypeDTO;
+import com.vci.dto.UIAuthorDTO;
import com.vci.pagemodel.PLUILayoutCloneVO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
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;
@@ -20,8 +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.Arrays;
+import java.util.Comparator;
import java.util.List;
/**
@@ -187,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);
@@ -266,4 +268,39 @@
}
}
+ /**
+ * 鏍规嵁瑙掕壊鑾峰彇UI/琛ㄥ崟/鎸夐挳鐨勬潈闄�.
+ * @param baseQueryObject
+ * @return
+ */
+ @GetMapping( "/getUIAuthor")
+ @VciBusinessLog(operateName = "UI鎺堟潈锛堟爲褰㈢粨鏋勶級")
+ public BaseResult getUIAuthor(BaseQueryObject baseQueryObject){
+ try {
+ return BaseResult.dataList( uiManagerService.getUIAuthor(baseQueryObject));
+ }catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "UI鎺堟潈鍔犺浇鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /***
+ * @param uiAuthorDTO 鍕鹃�夌殑闇�瑕佷繚瀛樼殑鏁版嵁瀵硅薄
+ * @return
+ */
+ @PostMapping( "/authorizedUI")
+ @VciBusinessLog(operateName = "UI鎺堟潈")
+ public BaseResult authorizedUI(UIAuthorDTO uiAuthorDTO){
+ try {
+ return uiManagerService.authorizedUI(uiAuthorDTO)?BaseResult.success("鎺堟潈鎴愬姛!"):BaseResult.fail("鎺堟潈澶辫触锛�");
+ }catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "UI鎺堟潈鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
}
--
Gitblit v1.10.0