From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 272823d..edb75f4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -2,8 +2,7 @@
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;
@@ -13,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;
@@ -33,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;
@@ -187,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);
}
}
}
@@ -204,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);
}
}
}
@@ -290,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);
@@ -336,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;
@@ -358,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;
--
Gitblit v1.9.3