From d039b89816988e6bed65ac7e5892d12df3e5e604 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 六月 2024 14:12:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java | 19 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 13 -
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java | 3
Bin/lib/service/ServiceBase.jar | 0
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 57 +++------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java | 8
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 10 -
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 65 +---------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java | 50 +++++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 42 ++----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 11 -
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 5
17 files changed, 117 insertions(+), 189 deletions(-)
diff --git a/Bin/lib/service/ServiceBase.jar b/Bin/lib/service/ServiceBase.jar
index 626d5b0..0fc6497 100644
--- a/Bin/lib/service/ServiceBase.jar
+++ b/Bin/lib/service/ServiceBase.jar
Binary files differ
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
index 8f6f784..736f373 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
@@ -395,15 +395,16 @@
*/
public boolean checkDataSecret(BaseModel baseModel) throws VciBaseException{
VciBaseUtil.alertNotNull(baseModel,"瑕佹牎楠屽瘑绾х殑鏁版嵁瀵硅薄");
- if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
- if (baseModel.getSecretGrade() == null ) {
- baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
- }
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- if (!checkUserSecret(baseModel.getSecretGrade())) {
- throw new VciBaseException("褰撳墠鐢ㄦ埛鐨勫瘑绾т綆浜庢暟鎹殑瀵嗙骇锛岀敤鎴峰瘑绾т负" + UserSecretEnum.getSecretText(userSecret) + ",鏁版嵁瀵嗙骇涓�" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
- }
- }
+ //todo 鐧诲綍杩樻湭鍚敤锛屾墍浠ュ瘑绾ф棤娉曡幏鍙栭渶瑕佷慨鏀�
+// if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
+// if (baseModel.getSecretGrade() == null ) {
+// baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
+// }
+// Integer userSecret = VciBaseUtil.getCurrentUserSecret();
+// if (!checkUserSecret(baseModel.getSecretGrade())) {
+// throw new VciBaseException("褰撳墠鐢ㄦ埛鐨勫瘑绾т綆浜庢暟鎹殑瀵嗙骇锛岀敤鎴峰瘑绾т负" + UserSecretEnum.getSecretText(userSecret) + ",鏁版嵁瀵嗙骇涓�" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
+// }
+// }
return true;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index 751c7ec..abc70d4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -1,7 +1,6 @@
package com.vci.frameworkcore.compatibility.impl;
import com.alibaba.fastjson.JSONObject;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FunctionInfo;
import com.vci.corba.portal.data.PLUILayout;
@@ -18,6 +17,7 @@
import com.vci.web.pageModel.UIContentVO;
import com.vci.web.service.UIEngineServiceI;
import com.vci.web.service.WebBoServiceI;
+import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -70,6 +70,9 @@
@Autowired
private UIEngineServiceI uiEngineServiceI;
+
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
/**
* 鏌ヨ鎵�鏈夌殑鍔熻兘
@@ -195,33 +198,6 @@
return functionVO;
}
-// /**
-// * 鑾峰彇褰撳墠瑙掕壊鐨勮彍鍗�
-// *
-// * @param treeQueryObject 灞炴�ф煡璇㈠璞�
-// * @param resourceControlTypeEnum 瑙掕壊鎺у埗鍖哄煙锛屼篃鏄姛鑳芥帶鍒剁殑鍖哄煙
-// * @return 鑿滃崟锛屽寘鍚笂涓嬬骇
-// */
-// @Override
-// public List<Tree> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) {
-// SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
-// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
-// return new ArrayList<Tree>();
-// }
-// if(resourceControlTypeEnum == null){
-// resourceControlTypeEnum = ResourceControlTypeEnum.BS;
-// }
-// Map<String, SmFunctionVO> functionVOMap = selectAllFunctionMap();
-// List<SmFunctionVO> functionVOList = new ArrayList<>();
-// for(String oid : sessionInfo.getFunctionOids()) {
-// SmFunctionVO functionVO = functionVOMap.get(oid);
-// if(functionVO !=null && resourceControlTypeEnum.getValue().equals(functionVO.getResourceControlType()) && functionVO.isDisplayFlag()) {
-// functionVOList.add(functionVO);
-// }
-// }
-// return dos2Trees(functionVOList.stream().sorted(Comparator.comparing(s -> s.getOrderNum())).collect(Collectors.toList()),treeQueryObject == null?null:treeQueryObject.getParentOid());
-// }
-
/**
* 鑾峰彇褰撳墠瑙掕壊鐨勮彍鍗�
*
@@ -232,20 +208,11 @@
@Override
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>();
-// }
if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}
-// 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();
+ FunctionInfo[] menus = platformClientUtil.getFrameworkService().getModuleListByParentId("modelManagmentNode", true);
List<MenuVO> functionVOList = new ArrayList<>();
-// Map<String, SmFunctionVO> functionVOMap = selectAllFunctionMap();
for (FunctionInfo menu : menus) {
if(!menu.isValid){
continue;
@@ -257,13 +224,6 @@
continue;
}
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);
@@ -278,12 +238,11 @@
}
functionVOList.add(functionVO);
}
-// return dos2Trees(functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList()),treeQueryObject == null?null:treeQueryObject.getParentOid());
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
public List<MenuVO> findChildFunctionVO(String parentOid) throws PLException {
- FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId(parentOid, true);
+ FunctionInfo[] menus = platformClientUtil.getFrameworkService().getModuleListByParentId(parentOid, true);
List<MenuVO> functionVOList = new ArrayList<>();
for (FunctionInfo menu : menus) {
if(!menu.isValid){
@@ -296,13 +255,6 @@
continue;
}
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);
@@ -324,13 +276,10 @@
@Override
public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
-// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
-// return new ArrayList<Tree>();
-// }
if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}
- for (PLUILayout allPLUILayout : ServiceProvider.getUIService().getAllPLUILayouts()) {
+ for (PLUILayout allPLUILayout : platformClientUtil.getUIService().getAllPLUILayouts()) {
if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
&& treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 45314e6..a61debc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.frameworkcore.compatibility.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.UserInfo;
@@ -147,7 +146,7 @@
" left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapper.getTableNick() + ".pluid = pkUserPassword.pluseruid " +
queryWrapper.getLinkTableSql() + (StringUtils.isNotBlank(queryWrapper.getWhereSql())?(" where " + queryWrapper.getWhereSql()):"");
try{
- String[][] sqlQueryResult = ServiceProvider.getBOFService().getSqlQueryResult(sql + fromSql, null);
+ String[][] sqlQueryResult = platformClientUtil.getBOFService().getSqlQueryResult(sql + fromSql, null);
if(sqlQueryResult.length>0){
com.vci.client.bof.ClientBusinessObject cbo = arryAndSqlToClientBusinessObject(queryWrapper.getSelectFieldSql(),sqlQueryResult[0]);
return cbo2VO(cbo);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java
index 0efebd6..eb3521a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java
@@ -40,7 +40,7 @@
/**
* 鏂囦粨鍚嶇О
*/
- @Column(nullable = false,length = 200,name = "plip")
+ @Column(nullable = false,length = 200,name = "plservice")
private String name;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index bfa29fd..45f22b4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -108,9 +107,7 @@
public List<OsAttributeVO> selectAllAttribute() {
//鍚庨潰涓や釜鍒嗛〉鏁帮紝瀹屽叏娌℃湁鐢�
try {
-// return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
-// return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
- return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs("",1,1)).collect(Collectors.toList()));
+ return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttributeDefs("",1,1)).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 9ec152c..0ef1e62 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.btm.BizType;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -15,6 +14,7 @@
import com.vci.web.service.*;
import com.vci.web.util.ConcurrentDateFormat;
import com.vci.web.util.Func;
+import com.vci.web.util.PlatformClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +42,8 @@
/**
* 骞冲彴鐨勮皟鐢ㄥ伐鍏风被
*/
- //@Autowired
- //private PlatformClientUtil platformClientUtil;
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
/**
* 灞炴�х殑鏈嶅姟
@@ -86,9 +86,7 @@
@VciUnLog
public List<OsBtmTypeVO> selectAllBtm() {
try {
- // return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
-// return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
- return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getBizTypes("")).collect(Collectors.toList()));
+ return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getBizTypes("")).collect(Collectors.toList()));
} catch (PLException e) {
throw new RuntimeException(e);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index a87274d..2832ab8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
@@ -46,7 +45,7 @@
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- //@Autowired
+ @Autowired
private PlatformClientUtil platformClientUtil;
/**
@@ -209,7 +208,7 @@
public List<OsEnumVO> selectAllEnum() {
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -326,7 +325,6 @@
VciBaseUtil.alertNotNull(oid,"涓氬姟鏁版嵁鐨勪富閿�",btmname,"涓氬姟绫诲瀷");
com.vci.client.bof.ClientBusinessObject cbo = boService.selectCBOByOid(oid, btmname);
String secret = cbo.getAttributeValue("secretGrade");
- //secret = DataSecretEnum.SECRET.getValue() + "";
if(StringUtils.isBlank(secret)){
return new ArrayList<>();
}else{
@@ -360,7 +358,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
+ platformClientUtil.getEnumService().addEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -378,8 +376,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
-// ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
- ServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
+ platformClientUtil.getEnumService().modifyEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index 3552e01..5fedebe 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
@@ -309,12 +308,11 @@
@VciUnLog
public List<OsLifeCycleVO> selectAllLifeCycle() throws VciBaseException {
try {
-// LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
- LifeCycle[] lifeCyles = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycles();
+ LifeCycle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCycles();
return lifeCycleDO2VOs(Arrays.stream(lifeCyles).collect(Collectors.toList()));
} catch (PLException vciError) {
if(logger.isErrorEnabled()){
-// logger.error(vciError.error_code,vciError);
+ logger.error(vciError.code,vciError);
}
throw WebUtil.getVciBaseException(vciError);
}
@@ -373,8 +371,7 @@
if(lineVO!=null){
try {
com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
-// platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
- ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
+ platformClientUtil.getBOFService().transferBusinessObject(obj, transitionVO.destination);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -604,9 +601,7 @@
for(int i = 0 ; i < lineVOs.length; i ++){
vos[i] = lifeCycleLineVO2DO(lineVOs[i]);
}
-// platformClientUtil.getBOFactoryService().batchTransferBusinessObjectAndRelease(
-// bos, vos, releaseStatus);
- ServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
+ platformClientUtil.getBOFService().batchTransferBusinessObjectAndRelease(
bos, vos, releaseStatus);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 88094a0..562ad05 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -125,8 +124,7 @@
@VciUnLog
public List<OsStatusVO> selectAllStatus() {
try {
-// return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
- return statusDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList()));
+ return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index dc56825..11ebca6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -1,11 +1,14 @@
package com.vci.web.service.impl;
+import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.bof.ClientLinkObject;
import com.vci.client.bof.RevisionValueObject;
import com.vci.client.bof.VersionValueObject;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.omd.data.*;
+import com.vci.corba.omd.data.BusinessObject;
+import com.vci.corba.omd.data.LinkObject;
+import com.vci.corba.omd.data.RevisionDataInfo;
+import com.vci.corba.omd.data.VersionDataInfo;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.file.pagemodel.VciFileObjectVO;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
@@ -1068,9 +1071,7 @@
BaseResult<Map<String,Object>> result = BaseResult.success();
com.vci.client.bof.ClientBusinessObject afterCBO = null;
try {
-// BusinessObject resultBO = platformClientUtil.getBOFactoryService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
-// BusinessObject resultBO = ServiceProvider.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
- BusinessObject resultBO = ServiceProvider.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
+ BusinessObject resultBO = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
afterCBO = new com.vci.client.bof.ClientBusinessObject();
afterCBO.setBusinessObject(resultBO);
result.setObj(boService.cbo2Map(afterCBO));
@@ -1087,8 +1088,7 @@
}catch (Throwable e){
//璇存槑鍚庣疆浜嬩欢鍑虹幇浜嗛敊璇紝閭ｄ箞灏遍渶瑕佸垹闄や互鍓嶇殑杩欐潯鏁版嵁
try {
-// platformClientUtil.getBOFactoryService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
- ServiceProvider.getBOFService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
+ platformClientUtil.getBOFService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1345,8 +1345,7 @@
}
}
try {
-// BusinessObject[] resultBOs = platformClientUtil.getBOFactoryService().batchCreateBusinessObject(addBos.toArray(new BusinessObject[0]), false, false);
- BusinessObject[] resultBOs = ServiceProvider.getBOFService().batchCreateBusinessObject(addBos.toArray(new BusinessObject[0]), false, false);
+ BusinessObject[] resultBOs = platformClientUtil.getBOFService().batchCreateBusinessObject(addBos.toArray(new BusinessObject[0]), false, false);
afterBOs = Arrays.stream(resultBOs).collect(Collectors.toList());
Arrays.stream(resultBOs).forEach(bo->{
com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
@@ -1406,8 +1405,7 @@
//鎵ц淇濆瓨
BaseResult<Map<String,Object>> result = BaseResult.success();
try {
-// platformClientUtil.getBOFactoryService().updateBusinessObject(new BusinessObjectHolder(resultCbo.getObj().getBusinessObject()));
- ServiceProvider.getBOFService().updateBusinessObject(resultCbo.getObj().getBusinessObject());
+ platformClientUtil.getBOFService().updateBusinessObject(resultCbo.getObj().getBusinessObject());
result.setObj(boService.cbo2Map(resultCbo.getObj()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
@@ -1452,8 +1450,7 @@
//鎵ц淇濆瓨
BaseResult<Map<String,Object>> result = BaseResult.success();
try {
-// BusinessObject bo = platformClientUtil.getBOFactoryService().createBusinessObject(resultCbo.getObj().getBusinessObject(),formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
- BusinessObject bo = ServiceProvider.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
+ BusinessObject bo = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
com.vci.client.bof.ClientBusinessObject afterCbo = new com.vci.client.bof.ClientBusinessObject();
afterCbo.setBusinessObject(bo);
result.setObj(boService.cbo2Map(afterCbo));
@@ -1611,8 +1608,7 @@
}
VciBaseUtil.switchCollectionForOracleIn(finalCbo).stream().forEach(cbos->{
try {
-// platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
- ServiceProvider.getBOFService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
+ platformClientUtil.getBOFService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1683,8 +1679,7 @@
//鏌ヨfrom绔殑
com.vci.client.bof.ClientBusinessObject fromCbo = new com.vci.client.bof.ClientBusinessObject();
try {
-// fromCbo.setBusinessObject(platformClientUtil.getBOFactoryService().readBusinessObject(fromOid,fromBtmName));
- fromCbo.setBusinessObject(ServiceProvider.getBOFService().readBusinessObject(fromOid,fromBtmName));
+ fromCbo.setBusinessObject(platformClientUtil.getBOFService().readBusinessObject(fromOid,fromBtmName));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1721,8 +1716,7 @@
clo.dealLinkObjectNullValue();
bos[0] = toCbo.getBusinessObject();
try {
-// platformClientUtil.getBOFactoryService().createBusinessObjectWithLink(bosHolder,loHolder);
- ServiceProvider.getBOFService().createBusinessObjectWithLink(bos,clo.getLinkObject());
+ platformClientUtil.getBOFService().createBusinessObjectWithLink(bos,clo.getLinkObject());
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1736,10 +1730,8 @@
}catch (Throwable e){
//璇存槑鍚庣疆浜嬩欢鍑虹幇浜嗛敊璇紝閭ｄ箞灏遍渶瑕佸垹闄や互鍓嶇殑杩欐潯鏁版嵁
try {
-// platformClientUtil.getBOFactoryService().deleteBusinessObject(toCbo.getBusinessObject(),1);
-// platformClientUtil.getBOFactoryService().deleteLinkObject(clo.getLinkObject());
- ServiceProvider.getBOFService().deleteBusinessObject(toCbo.getBusinessObject(),1);
- ServiceProvider.getBOFService().deleteLinkObject(clo.getLinkObject());
+ platformClientUtil.getBOFService().deleteBusinessObject(toCbo.getBusinessObject(),1);
+ platformClientUtil.getBOFService().deleteLinkObject(clo.getLinkObject());
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1775,8 +1767,7 @@
ClientLinkObject clo ;
if(editFlag){
try {
-// LinkObject linkObject = platformClientUtil.getBOFactoryService().readLinkObjectById(formLinkDataDTO.getOid(), formLinkDataDTO.getLinkType());
- LinkObject linkObject = ServiceProvider.getBOFService().readLinkObjectById(formLinkDataDTO.getOid(), formLinkDataDTO.getLinkType());
+ LinkObject linkObject = platformClientUtil.getBOFService().readLinkObjectById(formLinkDataDTO.getOid(), formLinkDataDTO.getLinkType());
clo = new ClientLinkObject();
clo.setLinkObject(linkObject);
} catch (PLException vciError) {
@@ -1938,14 +1929,13 @@
String btmName = baseDataMap.get("btmname");
String oid = baseDataMap.get("oid");
// ClientBusinessObject cbo = new ClientBusinessObject();
- com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
+ ClientBusinessObject cbo = new ClientBusinessObject();
String copyfromversion = baseDataMap.get("copyfromversion");
OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
List<String> attributeList = btmTypeVO.getAttributes().stream().map(attribute -> attribute.getId()).collect(Collectors.toList());
if(editFlag || newRevision || newVersion){
try {
-// cbo.setBusinessObject(platformClientUtil.getBOFactoryService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
- cbo.setBusinessObject(ServiceProvider.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
+ cbo.setBusinessObject(platformClientUtil.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
} catch (PLException vciError) {
throw new VciBaseException("浣跨敤涓婚敭鍦ㄧ郴缁熶腑娌℃湁鏌ヨ鍒版暟鎹�",new String[]{oid},vciError);
}
@@ -1974,10 +1964,9 @@
//鍗囩増鐨勬椂鍊欙紝鐢熷懡鍛ㄦ湡鐨勭姸鎬侀渶瑕佹敼鍔ㄥ埌榛樿鐘舵��
if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId())){
//鏌ヨ鐢熷懡鍛ㄦ湡
-// OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(btmTypeVO.getLifeCycleId());
LifeCycle lifeCycleVO = null;
try {
- lifeCycleVO = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
+ lifeCycleVO = platformClientUtil.getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
} catch (PLException e) {
throw new RuntimeException(e);
}
@@ -2000,10 +1989,9 @@
//鍗囩増鐨勬椂鍊欙紝鐢熷懡鍛ㄦ湡鐨勭姸鎬侀渶瑕佹敼鍔ㄥ埌榛樿鐘舵��
if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId())){
//鏌ヨ鐢熷懡鍛ㄦ湡
-// OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(btmTypeVO.getLifeCycleId());
LifeCycle lifeCycleVO = null;
try {
- lifeCycleVO = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
+ lifeCycleVO = platformClientUtil.getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
} catch (PLException e) {
throw new RuntimeException(e);
}
@@ -2223,11 +2211,8 @@
clo.setToBO(toCbo);
}
}
-// LinkObjectHolder loHolder = new LinkObjectHolder();
-// loHolder.value = clo.getLinkObject();
try {
-// platformClientUtil.getBOFactoryService().updateLinkObject(loHolder);
- ServiceProvider.getBOFService().updateLinkObject(clo.getLinkObject());
+ platformClientUtil.getBOFService().updateLinkObject(clo.getLinkObject());
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 6237182..adbbf81 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -4,7 +4,6 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import com.thoughtworks.xstream.io.xml.XppDriver;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.portal.data.*;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -131,8 +130,7 @@
public void checkInvalidXmlVI() {
PortalVI[] portalVIS = null;
try {
- portalVIS = ServiceProvider.getUIService().getAllPortalVI();
- // portalVIS = platformClientUtil.getPortalService().getAllPortalVI();
+ portalVIS = platformClientUtil.getUIService().getAllPortalVI();
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -156,7 +154,7 @@
public List<UIFormDefineVO> selectAllForm() {
PortalVI[] portalVIS = null;
try {
- portalVIS = ServiceProvider.getUIService().getAllPortalVI();
+ portalVIS = platformClientUtil.getUIService().getAllPortalVI();
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -405,7 +403,7 @@
if(!QUERY_BY_CACHE){
PortalVI portalVI = null;
try {
- portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
+ portalVI = platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -447,7 +445,7 @@
public List<UITableDefineVO> selectAllTable() {
PortalVI[] portalVIS = null;
try {
- portalVIS = ServiceProvider.getUIService().getAllPortalVI();
+ portalVIS = platformClientUtil.getUIService().getAllPortalVI();
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -523,7 +521,7 @@
self.selectAllForm().stream().filter(s -> formOid.equalsIgnoreCase(s.getOid())).findAny().orElseGet(() -> null);
}else{
try {
- formDefineVO = formDO2VO(ServiceProvider.getUIService().getPortalVIById(formOid));
+ formDefineVO = formDO2VO(platformClientUtil.getUIService().getPortalVIById(formOid));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -723,7 +721,7 @@
if(!QUERY_BY_CACHE){
PortalVI portalVI = null;
try {
- portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
+ portalVI = platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -764,8 +762,7 @@
@VciUnLog
public List<UIActionVO> selectAllAction() {
try {
-// return actionDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLAction()).collect(Collectors.toList()));
- return actionDO2VOs(Arrays.stream(ServiceProvider.getUIService().getAllPLAction()).collect(Collectors.toList()));
+ return actionDO2VOs(Arrays.stream(platformClientUtil.getUIService().getAllPLAction()).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1006,7 +1003,7 @@
*/
private List<UILayoutVO> listLayoutByContent(String pkContent){
try {
- return UILayoutDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLTabPagesByPageDefinationOId(pkContent)).collect(Collectors.toList()),true);
+ return UILayoutDO2VOs(Arrays.stream(platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(pkContent)).collect(Collectors.toList()),true);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1129,8 +1126,7 @@
if(queryDetail){
//鍗曚釜鐨勶紝鐩存帴鑾峰彇
try {
- layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
-// layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
+ layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1176,7 +1172,7 @@
}
if(!QUERY_BY_CACHE){
try {
- return uiComponentDO2VO(ServiceProvider.getUIService().getPLPageDefinationById(componentOid),true);
+ return uiComponentDO2VO(platformClientUtil.getUIService().getPLPageDefinationById(componentOid),true);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1248,8 +1244,7 @@
componentVO.setTableDefineVO(tableDefineVOMap.get(key));
}else{
try {
- componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
- //componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
+ componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1285,7 +1280,7 @@
tableDefineVO= tableDefineVOMap.get(key);
}else{
try {
- tableDefineVO = tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true);
+ tableDefineVO = tableDO2VO(platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1336,7 +1331,7 @@
componentVO.setFormDefineVO(formDefineVOMap.get(key));
}else{
try {
- componentVO.setFormDefineVO(formDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId())));
+ componentVO.setFormDefineVO(formDO2VO(platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId())));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1386,7 +1381,7 @@
@Override
public List<UIButtonDefineVO> listButtonByComponent(String pkComponent){
try {
- List<UIButtonDefineVO> buttonDefineVOS = buttonDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLTabButtonsByTableOId(pkComponent)).collect(Collectors.toSet())).stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
+ List<UIButtonDefineVO> buttonDefineVOS = buttonDO2VOs(Arrays.stream(platformClientUtil.getUIService().getPLTabButtonsByTableOId(pkComponent)).collect(Collectors.toSet())).stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
if(CollectionUtils.isEmpty(buttonDefineVOS)){
return buttonDefineVOS;
}
@@ -1460,8 +1455,7 @@
//鏌ユ壘鍙傛暟
Map<String,String> params = new HashMap<>();
try {
- //PLCommandParameter[] parameters = platformClientUtil.getPortalService().getPLCommandParametersByCommandOId(buttonVO.getOid());
- PLCommandParameter[] parameters = ServiceProvider.getUIService().getPLCommandParametersByCommandOId(buttonVO.getOid());
+ PLCommandParameter[] parameters = platformClientUtil.getUIService().getPLCommandParametersByCommandOId(buttonVO.getOid());
if(parameters!=null && parameters.length > 0){
for(PLCommandParameter parameter: parameters){
params.put(parameter.plKey,parameter.plValue);
@@ -1526,10 +1520,7 @@
WebUtil.alertNotNull(btmType,"涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�",id,"UI涓婁笅鏂囩殑缂栧彿");
PLUILayout[] obj = null;
try {
- obj = ServiceProvider.getUIService().getPLUILayoutsByRelatedType(btmType);
-// obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
-// obj = ServiceProvider.geT(btmType);
-
+ obj = platformClientUtil.getUIService().getPLUILayoutsByRelatedType(btmType);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1541,7 +1532,6 @@
}
}
return UIContentDO2VO(context,true);
-// return UIContentDO2VO(null,true);
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 243dbe7..84b6487 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -206,6 +206,9 @@
if(vciFileObjectDO.getSecretGrade() == null) {
vciFileObjectDO.setSecretGrade(DataSecretEnum.NONE.getValue());
}
+ //todo 鐧诲綍杩樻湭寮勫ソ闇�瑕佷慨鏀�
+ vciFileObjectDO.setCreator("1");
+ vciFileObjectDO.setLastModifier("1");
revisionModelUtil.wrapperForAdd(vciFileObjectDO);
//闅忔満璺緞
String randomPath = VciBaseUtil.getPk();
@@ -254,9 +257,9 @@
}
InputStream in = null;
if("filePathField".equalsIgnoreCase(vciFileObjectDO.getFileDocClassify())){
- vciFileObjectDO.setFilePath(vciFileVolumeDO.getId().toLowerCase() + ":/" + vciFileObjectDO.getFilePath() + "." + vciFileObjectDO.getFileExtension());
+ vciFileObjectDO.setFilePath(vciFileVolumeDO.getId() + ":/" + vciFileObjectDO.getFilePath() + "." + vciFileObjectDO.getFileExtension());
}else {
- vciFileObjectDO.setFilePath(vciFileVolumeDO.getId().toLowerCase() + ":/" + vciFileObjectDO.getFilePath());
+ vciFileObjectDO.setFilePath(vciFileVolumeDO.getId() + ":/" + vciFileObjectDO.getFilePath());
}
try{
long currentTime = volumnCorbaService.getCurrrentTimeMillions();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
index 623eeee..879ee86 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.PvolumeInfo;
import com.vci.file.dto.VciFileVolumeDTO;
@@ -384,7 +383,7 @@
@Override
public VciFileVolumeDO getUploadVolume(){
try {
- PvolumeInfo volumeInfo = ServiceProvider.getFrameService().getDefaultVolume();
+ PvolumeInfo volumeInfo = platformClientUtil.getFrameworkService().getDefaultVolume();
VciFileVolumeDO fileVolumeDO = new VciFileVolumeDO();
fileVolumeDO.setOid(volumeInfo.id);
fileVolumeDO.setId(volumeInfo.name);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 956faa7..a2c2054 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -154,7 +154,9 @@
if(btmName!=null){
btmName = btmName.trim().toLowerCase();
}
- String userid = WebUtil.getCurrentUserId();
+ //todo 鐢变簬鐧诲綍闂鍚庣画闇�瑕佷慨鏀�
+// String userid = WebUtil.getCurrentUserId();
+ String userid = "1";
if(!hasCreatedCbos.containsKey(btmName)){
if(StringUtils.isEmpty(userid)){
throw new VciBaseException(msgCodePrefix +"noHasUserid");
@@ -204,7 +206,8 @@
bo.setLctId(btmTypeVO.getLifeCycleId());
if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId())){
OsLifeCycleVO lifeCycleVO = lifeService.getLifeCycleById(btmTypeVO.getLifeCycleId());
- bo.setLcStatus(lifeCycleVO.getStartStatus());
+ //todo 鏃犳硶鑾峰彇鏁版嵁
+ // bo.setLcStatus(lifeCycleVO.getStartStatus());
}
bo.setId("");
bo.setName("");
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
index 65827a3..f7c0e14 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
@@ -7,7 +7,6 @@
import com.vci.client.bof.ClientLinkObject;
import com.vci.client.bof.ClientLinkObjectOperation;
import com.vci.client.common.oq.OQTool;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.common.qt.object.*;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
@@ -34,6 +33,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+
import java.util.*;
import java.util.stream.Collectors;
@@ -588,8 +588,7 @@
}
boService.setPageAndOrderToQT(qt,linkTypeDataQuery.getPageHelper());
try {
-// com.vci.corba.query.data.BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
- com.vci.corba.query.data.BOAndLO[] bos = ServiceProvider.getOQService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
+ com.vci.corba.query.data.BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
return Arrays.stream(bos).collect(Collectors.toList());
} catch (PLException e) {
// logger.error(e.error_code,e);
@@ -703,8 +702,7 @@
Map<String,List<String>> toBtmOidsMap = new HashMap<>();
try {
IntHolder totalHolder = new IntHolder();
-// com.vci.corba.omd.data.LinkObject[] linkObjects = platformClientUtil.getQueryService().findLTObjectsV2(qt.getId(), OQTool.qtTOXMl(qt).asXML(),totalHolder);
- ObjectQueryService.FindLTObjectsV2Result linkObjects = ServiceProvider.getOQService().findLTObjectsV2(qt.getId(), OQTool.qtTOXMl(qt).asXML());
+ ObjectQueryService.FindLTObjectsV2Result linkObjects = platformClientUtil.getQueryService().findLTObjectsV2(qt.getId(), OQTool.qtTOXMl(qt).asXML());
List<Map<String,String>> data = new ArrayList<>();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
index 11f7abf..8dc8bc0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
@@ -1,6 +1,6 @@
package com.vci.web.util;
-import com.vci.client.common.providers.ServiceProvider;
+import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.bofactory.BOFactoryServicePrx;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.FrameworkServicePrx;
@@ -87,7 +87,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public BOFactoryServicePrx getBOFactoryService(){
- return ServiceProvider.getBOFService();
+ return ClientServiceProvider.getBOFService();
}
/**
@@ -95,7 +95,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public WorkflowServicePrx getWorkflowService(){
- return ServiceProvider.getWFService();
+ return ClientServiceProvider.getWFService();
}
/**
@@ -103,7 +103,7 @@
* @Return 鏈嶅姟鐨勫璞�
*/
public FrameworkServicePrx getFrameworkService(){
- return ServiceProvider.getFrameService();
+ return ClientServiceProvider.getFrameService();
}
/**
@@ -111,7 +111,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public StatePoolServicePrx getStatePoolService() throws PLException {
- return ServiceProvider.getOMDService().getStateService();
+ return ClientServiceProvider.getOMDService().getStateService();
}
/**
@@ -119,7 +119,7 @@
* @return 鐢熷懡鍛ㄦ湡鐨勬湇鍔″璞�
*/
public LifeCycleServicePrx getLifeCycleService() throws PLException {
- return ServiceProvider.getOMDService().getLifeCycleService();
+ return ClientServiceProvider.getOMDService().getLifeCycleService();
}
/**
@@ -127,7 +127,7 @@
* @return 鏋氫妇鐨勬湇鍔″璞�
*/
public EnumServicePrx getEnumService() throws PLException {
- return ServiceProvider.getOMDService().getEnumService();
+ return ClientServiceProvider.getOMDService().getEnumService();
}
/**
@@ -135,7 +135,7 @@
* @return 鐗堟湰瑙勫垯鐨勬湇鍔�
*/
public VersionRuleServicePrx getVersionService() throws PLException {
- return ServiceProvider.getOMDService().getVerRuleService();
+ return ClientServiceProvider.getOMDService().getVerRuleService();
}
/**
@@ -143,7 +143,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public AttPoolServicePrx getAttributeService() throws PLException {
- return ServiceProvider.getOMDService().getAttributeService();
+ return ClientServiceProvider.getOMDService().getAttributeService();
}
/**
@@ -151,7 +151,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public BTMServicePrx getBtmService() throws PLException {
- return ServiceProvider.getOMDService().getBTMService();
+ return ClientServiceProvider.getOMDService().getBTMService();
}
/**
@@ -159,7 +159,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public LinkTypeServicePrx getLinkTypeService() throws PLException {
- return ServiceProvider.getOMDService().getLinkTypeService();
+ return ClientServiceProvider.getOMDService().getLinkTypeService();
}
/**
@@ -167,7 +167,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public PortalServicePrx getPortalService(){
- return ServiceProvider.getUIService();
+ return ClientServiceProvider.getUIService();
}
/**
@@ -175,7 +175,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public ObjectQueryServicePrx getQueryService(){
- return ServiceProvider.getOQService();
+ return ClientServiceProvider.getOQService();
}
/**
@@ -184,7 +184,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public VolumeServicePrx getVolumeService(String volumeName){
- return ServiceProvider.getVolumeService(volumeName);
+ return ClientServiceProvider.getVolumeService(volumeName);
}
/**
@@ -192,7 +192,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public QTDServicePrx getQTDService() throws PLException {
- return ServiceProvider.getOMDService().getQTDService();
+ return ClientServiceProvider.getOMDService().getQTDService();
}
/**
@@ -202,7 +202,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public String[][] getSqlQueryService(String sql, AttributeValue[] attrVals) throws PLException {
- return ServiceProvider.getBOFService().getSqlQueryResult(sql, attrVals);
+ return ClientServiceProvider.getBOFService().getSqlQueryResult(sql, attrVals);
}
/**
@@ -210,6 +210,22 @@
* @Return com.vci.corba.log.LogServicePrx
*/
public LogServicePrx getLogService(){
- return ServiceProvider.getLogService();
+ return ClientServiceProvider.getLogService();
+ }
+
+ /**
+ * 鑾峰彇UI鏈嶅姟
+ * @return
+ */
+ public PortalServicePrx getUIService(){
+ return ClientServiceProvider.getUIService();
+ }
+
+ /**
+ * 鑾峰彇瀵硅薄宸ュ巶鏈嶅姟
+ * @return
+ */
+ public BOFactoryServicePrx getBOFService() {
+ return ClientServiceProvider.getBOFService();
}
}
--
Gitblit v1.9.3