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/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
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);
--
Gitblit v1.9.3