From fcfd509a549e5e71b35d6a727aba2a2647aff656 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 九月 2024 17:56:12 +0800
Subject: [PATCH] 按钮设计对话框：删除、调整为上级按钮、调整为下级按钮接口上传。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java | 26 +++++++-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLTabButtonVO.java | 6 ++
3 files changed, 131 insertions(+), 14 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLTabButtonVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLTabButtonVO.java
index 6aaa7e2..647c43b 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLTabButtonVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLTabButtonVO.java
@@ -5,6 +5,7 @@
import lombok.NoArgsConstructor;
import java.util.LinkedHashMap;
+import java.util.List;
/**
* 鎸夐挳閰嶇疆VO瀵硅薄
@@ -69,6 +70,11 @@
private String parentOid;
/**
+ * 瀛愭寜閽�
+ */
+ private List<PLTabButtonVO> children;
+
+ /**
* 鏄惁鏄剧ず
*/
private String displayMode;
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 8cc0a49..3b4f001 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
@@ -145,7 +145,7 @@
* @param pageDefinationOid
* @return
*/
- List<PLTabButtonVO> getTabButton(String pageDefinationOid);
+ List<PLTabButtonVO> getTabButtons(String pageDefinationOid);
/**
* 娣诲姞鎸夐挳閰嶇疆淇℃伅
@@ -168,6 +168,26 @@
*/
boolean saveOrUpdateTapButton(PLTabButtonVO tabButtonVO,boolean isAdd);
+ /**
+ * 鍒犻櫎鍗曚釜鎸夐挳閰嶇疆
+ * @param tabButton
+ * @return
+ */
+ boolean deleteTapButton(PLTabButton tabButton) throws PLException;
+
+ /**
+ * 璋冩暣涓轰笅绾ф寜閽�
+ * @param plTabButton
+ * @return
+ */
+ BaseResult joinBtn(PLTabButton plTabButton) throws PLException;
+
+ /**
+ * 璋冩暣涓轰笂绾ф寜閽�
+ * @param plTabButton
+ * @return
+ */
+ BaseResult exitBtn(PLTabButton plTabButton) throws PLException;
/**
* 鑾峰彇UI鏉冮檺鏍�
@@ -177,13 +197,13 @@
*/
List<Tree> getUIAuthor(BaseQueryObject baseQueryObject)throws Exception;
- /***
+ /**
* UI鎺堟潈
* @param uiAuthorDTO
* @return
* @throws Exception
*/
- public boolean authorizedUI(UIAuthorDTO uiAuthorDTO)throws Exception;
+ boolean authorizedUI(UIAuthorDTO uiAuthorDTO)throws Exception;
}
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 7cff12c..408a5c2 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
@@ -8,11 +8,9 @@
import com.vci.corba.portal.data.*;
import com.vci.dto.RoleRightDTO;
import com.vci.dto.UIAuthorDTO;
+import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.model.PLDefination;
-import com.vci.pagemodel.PLDefinationVO;
-import com.vci.pagemodel.PLTabButtonVO;
-import com.vci.pagemodel.PLUILayoutCloneVO;
-import com.vci.pagemodel.RoleRightVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -39,6 +37,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.swing.*;
+import javax.swing.tree.TreePath;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -58,16 +57,12 @@
@Resource
private PlatformClientUtil platformClientUtil;
- /**
- * 瑙掕壊
- */
- @Resource
- private SmRoleQueryServiceI smRoleQueryServiceI;
/***
* 鏄惁鏄鐞嗗憳
*/
@Autowired
RightControlUtil rightControlUtil;
+
/**
* 涓氬姟绫诲瀷
*/
@@ -697,13 +692,22 @@
* @return
*/
@Override
- public List<PLTabButtonVO> getTabButton(String pageDefinationOid) {
+ public List<PLTabButtonVO> getTabButtons(String pageDefinationOid) {
VciBaseUtil.alertNotNull(pageDefinationOid,"椤甸潰瀹氫箟涓婚敭");
List<PLTabButton> buttonList = new ArrayList<>();
try {
PLTabButton[] plTabButtons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(pageDefinationOid);
buttonList = Arrays.asList(plTabButtons);
- return this.tabButton2TabButtonVOS(buttonList);
+ List<PLTabButtonVO> plTabButtonVOList = this.tabButton2TabButtonVOS(buttonList);
+ PLTabButtonVO plTabButtonVO = new PLTabButtonVO();
+ for(int i = 0; i < plTabButtonVOList.size(); i++){
+ plTabButtonVO = plTabButtonVOList.get(i);
+
+ if(plTabButtonVO.getParentOid().equals("")){
+ plTabButtonVO.setChildren(plTabButtonVO2Children(plTabButtonVOList,plTabButtonVO.getOId()));
+ }
+ }
+ return plTabButtonVOList;
} catch (Exception e) {
e.printStackTrace();
throw new VciBaseException("鍔犺浇椤电鍖哄煙鎸夐挳閰嶇疆淇℃伅寮傚父锛�" + e.getMessage());
@@ -770,6 +774,26 @@
plTabButtonVO.setButtonParams(parameterMap);
}
return plTabButtonVO;
+ }
+
+ /**
+ * 鎸夐挳閰嶇疆瀛愯妭鐐规煡鎵�
+ * @param plOid
+ * @param plTabButtonVOList
+ * @return
+ */
+ private List<PLTabButtonVO> plTabButtonVO2Children(List<PLTabButtonVO> plTabButtonVOList, String plOid){
+ ArrayList<PLTabButtonVO> plTabButtonVOS = new ArrayList<>();
+ for (PLTabButtonVO plTabButtonVO : plTabButtonVOList) {
+ if(StringUtils.isBlank(plTabButtonVO.getParentOid())){
+ continue;
+ }
+ if(plTabButtonVO.getParentOid().equals(plOid)){
+ plTabButtonVO.setChildren(plTabButtonVO2Children(plTabButtonVOList,plOid));
+ plTabButtonVOS.add(plTabButtonVO);
+ }
+ }
+ return plTabButtonVOS;
}
/**
@@ -907,7 +931,71 @@
return true;
}
+ /**
+ * 鍒犻櫎鍗曚釜鎸夐挳閰嶇疆
+ * @param tabButton
+ * @return
+ */
+ @Override
+ public boolean deleteTapButton(PLTabButton tabButton) throws PLException {
+ VciBaseUtil.alertNotNull(tabButton,"鍒犻櫎鐨勬寜閽厤缃璞�");
+ boolean success = UITools.getService().deletePLTabButton(tabButton);
+ if(success == false){
+ throw new VciBaseException("璇ユ湁瀛愮骇鎸夐挳锛屼笉鑳藉垹闄わ紒");
+ }
+ return true;
+ }
+ /**
+ * 璋冩暣涓轰笅绾ф寜閽�
+ * @param plTabButton
+ * @return
+ */
+ @Override
+ public BaseResult joinBtn(PLTabButton plTabButton) throws PLException {
+ VciBaseUtil.alertNotNull(plTabButton,"闇�璋冩暣涓轰笅绾ф寜閽�",plTabButton.plTableOId,"褰撳墠鎸夐挳閰嶇疆鎵�鍦ㄧ殑椤甸潰涓婚敭");
+ //鍚屼竴椤甸潰涓嬬殑鎸夐挳
+ List<PLTabButtonVO> plTabButtons = this.getTabButtons(plTabButton.plTableOId);
+ if(Func.isEmpty(plTabButtons)){
+ return BaseResult.fail("鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�");
+ }
+ //鑾峰彇褰撳墠瑕佺Щ鍔ㄧ殑鎸夐挳鐨勪笅鏍�
+ int index = 0;
+ for (int i = 0; i < plTabButtons.size(); i++) {
+ if (plTabButtons.get(i).getOId().equals(plTabButton.plOId)) {
+ index = i; // 鎵惧埌鍚庤褰曚笅鏍�
+ break; // 鎵惧埌鍚庨��鍑哄惊鐜�
+ }
+ }
+ //褰撻�夋嫨鐨勬寜閽负鏍戠殑绗竴涓妭鐐圭殑鏃跺�欙紝浠栫殑鍏勮妭鐐规槸浠栬嚜宸憋紝瀵艰嚧璋冩暣涓轰笅绾ф寜閽椂鍑洪敊锛屾晠浣滄鍒ゆ柇銆�
+ if(index == 0){
+ return BaseResult.fail("褰撳墠鑺傜偣涓嶅瓨鍦ㄥ厔鑺傜偣锛屾棤娉曡皟鏁翠负涓嬬骇鎸夐挳锛�");
+ }
+ //璁剧疆鐖秈d涓轰笂涓�涓妭鐐圭殑
+ plTabButton.plParentOid = plTabButtons.get(index-1).getOId();
+
+ boolean success = platformClientUtil.getUIService().updatePLTabButton(plTabButton);
+ if(success == false) {
+ return BaseResult.fail("淇敼澶辫触锛�");
+ }
+ return BaseResult.fail("淇敼鎴愬姛锛�");
+ }
+
+ /**
+ * 璋冩暣涓轰笂绾ф寜閽�
+ * @param plTabButton
+ * @return
+ */
+ @Override
+ public BaseResult exitBtn(PLTabButton plTabButton) throws PLException {
+ plTabButton.plParentOid = "";
+
+ boolean success = platformClientUtil.getUIService().updatePLTabButton(plTabButton);
+ if(success == false) {
+ BaseResult.fail("鎾ら攢澶辫触锛�");
+ }
+ return BaseResult.success("鎾ら攢鎴愬姛锛�");
+ }
/**
* 澶勭悊閰嶇疆鐨別vent浜嬩欢
@@ -1168,6 +1256,7 @@
}
+
/**
* 鑾峰彇鏉冮檺
* @param isUp 鏄惁鏄悜涓婅幏鍙栵紝濡傛灉鏄悜涓婅幏鍙栵紝浼犺繘鏉ョ殑蹇呯劧鏄ā鍧楄妭鐐癸紝涓斾笂绾фā鍧楀繀鐒舵槸娌℃湁閫変腑
@@ -1281,6 +1370,7 @@
}
}
+
/**
* 浼犲叆鐩存帴鎸傛帴鎿嶄綔鐨勬ā鍧楃殑鑺傜偣,璁＄畻璇ヨ妭鐐圭殑鏉冮檺鍊�
* @param node 妯″潡鑺傜偣
@@ -1313,6 +1403,7 @@
}
});
}
+
private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String,RoleRightVO> roleRightVOMap,boolean isShowCheckBox){
Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<Tree>()).stream().forEach(pTree -> {
Object funcObj= pTree.getData();
--
Gitblit v1.9.3