Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java

@@ -1,6 +1,8 @@
package com.vci.web.service.impl;

import com.vci.corba.common.VCIError;
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;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -10,11 +12,8 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dto.OsStatusDTO;
import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.model.OsStatusDO;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
@@ -30,7 +29,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.corba.statePoolManager.StatePool;

import java.util.*;
import java.util.stream.Collectors;
@@ -85,15 +83,15 @@
     * @return 显示对象
     */
    @Override
    public OsStatusVO statusDO2VO(StatePool statePool) {
    public OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool) {
        OsStatusVO statusVO = new OsStatusVO();
        if(statePool!=null){
            statusVO.setOid(statePool.oid);
            statusVO.setCreator(statePool.creator);
            statusVO.setLastModifier(statePool.modifier);
            try {
                statusVO.setCreateTime(VciDateUtil.str2Date(statePool.createTime,VciDateUtil.DateTimeFormat));
                statusVO.setLastModifyTime(VciDateUtil.str2Date(statePool.modifyTime,VciDateUtil.DateTimeFormat));
                statusVO.setCreateTime(new Date(statePool.createTime));
                statusVO.setLastModifyTime(new Date(statePool.modifyTime));
                statusVO.setTs(VciDateUtil.str2Date(statePool.ts,VciDateUtil.DateTimeMillFormat));
            } catch (Exception e) {
                e.printStackTrace();
@@ -112,7 +110,7 @@
     * @return 显示对象
     */
    @Override
    public List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools) {
    public List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools) {
        List<OsStatusVO> statusVOS = new ArrayList<>();
        if(!CollectionUtils.isEmpty(statePools)){
            statePools.stream().forEach(statePool -> {
@@ -132,8 +130,9 @@
    @VciUnLog
    public List<OsStatusVO> selectAllStatus() {
        try {
            return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
        } catch (VCIError vciError) {
//            return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
            return statusDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList()));
        } catch (PLException vciError) {
            throw WebUtil.getVciBaseException(vciError);
        }
    }
@@ -183,8 +182,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().addStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -200,8 +199,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().modifyStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -286,7 +285,7 @@
        OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
        StatePool pool = statusDTO2DO(statusDTO);
        pool.creator = statusVO.getCreator();
        pool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
        pool.createTime = statusVO.getCreateTime().getTime();
        List<StatePool> poolList = new ArrayList<>();
        poolList.add(pool);
        batchEditSave(poolList);
@@ -332,9 +331,9 @@
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        statePool.creator = userId;
        statePool.createTime = now;
        statePool.createTime = System.currentTimeMillis();
        statePool.modifier = userId;
        statePool.modifyTime = now;
        statePool.modifyTime = System.currentTimeMillis();
        statePool.ts = statusDTO.getTs()==null?now:VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusDTO.getName();
        return statePool;
@@ -354,9 +353,9 @@
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        statePool.creator = statusVO.getCreator();
        statePool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
        statePool.createTime = statusVO.getCreateTime().getTime();
        statePool.modifier = statusVO.getLastModifier();
        statePool.modifyTime = VciDateUtil.date2Str(statusVO.getLastModifyTime(),VciDateUtil.DateTimeMillFormat);;
        statePool.modifyTime = statusVO.getLastModifyTime().getTime();
        statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusVO.getName();
        return statePool;