From 663878fdcd0d44c105888014f4cdf7fc926f609f Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期三, 19 六月 2024 10:27:04 +0800 Subject: [PATCH] 1、去掉client包的相关更改。 2、修改登录鉴权修改。 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 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..64effb0 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,7 +1,7 @@ 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; @@ -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