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

@@ -8,7 +8,6 @@
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;
@@ -285,7 +284,7 @@
        OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
        StatePool pool = statusDTO2DO(statusDTO);
        pool.creator = statusVO.getCreator();
        pool.createTime = statusVO.getCreateTime().getTime();
        pool.createTime = VciDateUtil.getTime(statusVO.getCreateTime());
        List<StatePool> poolList = new ArrayList<>();
        poolList.add(pool);
        batchEditSave(poolList);
@@ -329,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 = System.currentTimeMillis();
        statePool.createTime = now;
        statePool.modifier = userId;
        statePool.modifyTime = System.currentTimeMillis();
        statePool.ts = statusDTO.getTs()==null?now:VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.modifyTime = now;
        statePool.ts = statusDTO.getTs()==null?VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat):VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusDTO.getName();
        return statePool;
    }
@@ -353,9 +352,9 @@
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        statePool.creator = statusVO.getCreator();
        statePool.createTime = statusVO.getCreateTime().getTime();
        statePool.createTime = VciDateUtil.getTime(statusVO.getCreateTime());
        statePool.modifier = statusVO.getLastModifier();
        statePool.modifyTime = statusVO.getLastModifyTime().getTime();
        statePool.modifyTime = VciDateUtil.getTime(statusVO.getLastModifyTime());
        statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusVO.getName();
        return statePool;