From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +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 | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 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 7f48730..a1deb7c 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,17 +1,17 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.corba.omd.lcm.TransitionVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.model.OsLifeCycleDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.OsLifeCycleDO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -28,9 +28,9 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
-import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
-import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
+import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;
/**
* 鐢熷懡鍛ㄦ湡鏈嶅姟
@@ -152,12 +152,12 @@
* @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public void transCboStatus(List<com.vci.client.bof.ClientBusinessObject> cboList,
+ public void transCboStatus(List<BusinessObject> cboList,
String targetStatus) throws VciBaseException {
WebUtil.alertNotNull(cboList,"涓氬姟鏁版嵁瀵硅薄",targetStatus,"鐩爣瀵硅薄");
- com.vci.corba.omd.data.BusinessObject[] bos = new com.vci.corba.omd.data.BusinessObject[cboList.size()];
+ BusinessObject[] bos = new BusinessObject[cboList.size()];
for(int i = 0 ; i < cboList.size() ; i ++){
- bos[i] = cboList.get(i).getBusinessObject();
+ bos[i] = cboList.get(i);
}
transStatus(bos, targetStatus);
}
@@ -309,12 +309,11 @@
@VciUnLog
public List<OsLifeCycleVO> selectAllLifeCycle() throws VciBaseException {
try {
-// LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
- LifeCycle[] lifeCyles = ClientServiceProvider.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 +372,7 @@
if(lineVO!=null){
try {
com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
-// platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
- ClientServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
+ platformClientUtil.getBOFService().transferBusinessObject(obj, transitionVO.destination);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -604,9 +602,7 @@
for(int i = 0 ; i < lineVOs.length; i ++){
vos[i] = lifeCycleLineVO2DO(lineVOs[i]);
}
-// platformClientUtil.getBOFactoryService().batchTransferBusinessObjectAndRelease(
-// bos, vos, releaseStatus);
- ClientServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
+ platformClientUtil.getBOFService().batchTransferBusinessObjectAndRelease(
bos, vos, releaseStatus);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
--
Gitblit v1.9.3