From 72c7bbd66b8456db7dabf0dbc15f7aa9c2af2b9d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 14:53:54 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index eeb450e..58977d3 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -2,9 +2,8 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.providers.ServiceProvider;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FunctionInfo;
-import com.vci.corba.portal.data.PLTabPage;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
@@ -29,7 +28,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
import java.util.stream.Collectors;
@@ -238,7 +236,7 @@
* @return 鑿滃崟锛屽寘鍚笂涓嬬骇
*/
@Override
- public List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws VCIError {
+ public List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
// return new ArrayList<Tree>();
@@ -249,6 +247,7 @@
// PortalServicePrx uiService = ServiceProvider.getUIService();
// FrameworkServicePrx frameService = ServiceProvider.getFrameService();
FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
+// FunctionInfo[] menus = ServiceProvider.getFrameService().("modelManagmentNode", true);
// PLAction[] allPLAction = uiService.getAllPLAction();
List<MenuVO> functionVOList = new ArrayList<>();
@@ -260,16 +259,17 @@
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
functionVO.setSource(menu.image);
- if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
+ if(StringUtils.isBlank(menu.resourceB)){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setParentId(menu.parentId);
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
@@ -288,7 +288,7 @@
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
- public List<MenuVO> findChildFunctionVO(String parentOid) throws VCIError {
+ public List<MenuVO> findChildFunctionVO(String parentOid) throws PLException {
FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId(parentOid, true);
List<MenuVO> functionVOList = new ArrayList<>();
for (FunctionInfo menu : menus) {
@@ -298,16 +298,17 @@
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
functionVO.setSource(menu.image);
- if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
+ if(StringUtils.isBlank(menu.resourceB) ){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setParentId(menu.parentId);
@@ -327,7 +328,7 @@
@Override
- public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws VCIError {
+ public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
// return new ArrayList<Tree>();
@@ -335,13 +336,9 @@
if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}
-// PortalServicePrx uiService = ServiceProvider.getUIService();
-// FrameworkServicePrx frameService = ServiceProvider.getFrameService();
-// FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
for (PLUILayout allPLUILayout : ServiceProvider.getUIService().getAllPLUILayouts()) {
- if("folder".equals(allPLUILayout.plRelatedType) && "cardtemplatemanager".equals(allPLUILayout.plCode)){
-// if("workflowinstance".equals(allPLUILayout.plRelatedType)){
-// System.out.printf("");
+ if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
+ && treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
}
}
@@ -572,7 +569,7 @@
if(!CollectionUtils.isEmpty(functionVOS)){
functionVOList.addAll(functionVOS);
String sql = "select plfuncoid,plroleoid from plroleright where plroleoid in (" + WebUtil.toInSql(roleOids.toArray(new String[0])) + ")";
- List<ClientBusinessObject> cbos = boService.queryBySql(sql, null);
+ List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryBySql(sql, null);
if(!CollectionUtils.isEmpty(cbos)){
cbos.stream().forEach(cbo->{
String roleOid = cbo.getAttributeValue("plroleoid");
--
Gitblit v1.9.3