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;
@@ -10,7 +9,6 @@
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.constant.CacheKeyConstant;
import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.pageModel.*;
import com.vci.web.service.OsLifeCycleServiceI;
@@ -22,8 +20,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -32,7 +28,6 @@
import java.util.stream.Collectors;

import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;

@@ -313,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);
      }
@@ -331,7 +325,6 @@
    */
   @Override
   @VciUnLog
   @Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_LIFE_CYCLE,unless="#result == null")
   public Map<String,OsLifeCycleVO> selectAllLifeCycleMap() throws VciBaseException{
      return Optional.ofNullable(self.selectAllLifeCycle()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId(),t->t,(o1,o2)->o1));
   }
@@ -340,7 +333,6 @@
    * 清除缓存
    */
   @Override
   @CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_LIFE_CYCLE)
   public void clearCache() {

   }
@@ -379,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);
         }
@@ -610,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);