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

@@ -2,22 +2,17 @@

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.query.data.KV;
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;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.BeanUtil;
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;
@@ -33,7 +28,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;
@@ -187,8 +181,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().addStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -204,8 +198,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().modifyStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -290,7 +284,7 @@
        OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
        StatePool pool = statusDTO2DO(statusDTO);
        pool.creator = statusVO.getCreator();
        pool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
        pool.createTime = VciDateUtil.getTime(statusVO.getCreateTime());
        List<StatePool> poolList = new ArrayList<>();
        poolList.add(pool);
        batchEditSave(poolList);
@@ -334,12 +328,12 @@
        statePool.name = statusDTO.getId();
        statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription();
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        long now = VciDateUtil.getTime(VciDateUtil.getNow());
        statePool.creator = userId;
        statePool.createTime = now;
        statePool.modifier = userId;
        statePool.modifyTime = now;
        statePool.ts = statusDTO.getTs()==null?now:VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.ts = statusDTO.getTs()==null?VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat):VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusDTO.getName();
        return statePool;
    }
@@ -358,9 +352,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 = VciDateUtil.getTime(statusVO.getCreateTime());
        statePool.modifier = statusVO.getLastModifier();
        statePool.modifyTime = VciDateUtil.date2Str(statusVO.getLastModifyTime(),VciDateUtil.DateTimeMillFormat);;
        statePool.modifyTime = VciDateUtil.getTime(statusVO.getLastModifyTime());
        statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusVO.getName();
        return statePool;