From f29ad099c6dc5c55d6cb94fb190d06743777ec6d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 10:56:48 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index a8f477d..28b4d73 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -2,44 +2,31 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
+import com.vci.corba.omd.lcm.TransitionVO;
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.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.model.OsLifeCycleDO;
-import com.vci.web.model.OsStatusDO;
import com.vci.web.pageModel.*;
import com.vci.web.service.OsLifeCycleServiceI;
-import com.vci.web.service.OsLinkTypeServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.taskdefs.condition.Os;
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.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.common.BusinessObject;
-import plm.bs.bom.common.BusinessObjectHolder;
-import plm.corba.lifecycle.Bound;
-import plm.corba.lifecycle.LifeCyle;
-import plm.corba.lifecycle.TransitionVO;
-import plm.corba.lifecycle.TransitionVOEvent;
import java.util.*;
import java.util.stream.Collectors;
@@ -276,16 +263,16 @@
* @return 鏁版嵁瀵硅薄
*/
@Override
- public LifeCyle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
- LifeCyle lifeCyle = new LifeCyle();
+ public LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
+ LifeCycle lifeCyle = new LifeCycle();
lifeCyle.name = lifeCycleVO.getId();
lifeCyle.tag = lifeCycleVO.getName();
lifeCyle.oid = lifeCycleVO.getOid();
lifeCyle.creator = lifeCycleVO.getCreator();
lifeCyle.description = lifeCycleVO.getDescription();
lifeCyle.modifier = lifeCycleVO.getLastModifier();
- lifeCyle.modifyTime = VciDateUtil.date2Str(lifeCycleVO.getLastModifyTime(),VciDateUtil.DateTimeFormat);
- lifeCyle.createTime = VciDateUtil.date2Str(lifeCycleVO.getCreateTime(),VciDateUtil.DateTimeFormat);
+ lifeCyle.modifyTime = lifeCycleVO.getLastModifyTime() != null ? lifeCycleVO.getLastModifyTime().getTime():null;
+ lifeCyle.createTime = lifeCycleVO.getCreateTime() != null ? lifeCycleVO.getCreateTime().getTime():null;
lifeCyle.startState =lifeCycleVO.getStartStatus();
lifeCyle.ts = VciDateUtil.date2Str(lifeCycleVO.getTs(),VciDateUtil.DateTimeMillFormat);
if(lifeCycleVO.getBounds() !=null && lifeCycleVO.getBounds().length>0) {
@@ -307,7 +294,7 @@
lifeCyle.bounds = new Bound[0];
}
//鍔犻摼鎺ョ嚎
- List<com.vci.corba.omd.lcm.TransitionVO> lines = new ArrayList<>();
+ List<TransitionVO> lines = new ArrayList<>();
for (int i = 0; i < lifeCycleVO.getLines().size(); i++) {
OsLifeCycleLineVO lineVO = lifeCycleVO.getLines().get(i);
lines.add(lifeCycleLineVO2DO(lineVO));
@@ -473,12 +460,12 @@
* @param lifeCyleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
@Override
- public void batchAddLifeCycle(List<LifeCyle> lifeCyleList) {
+ public void batchAddLifeCycle(List<LifeCycle> lifeCyleList) {
if(!CollectionUtils.isEmpty(lifeCyleList)){
lifeCyleList.stream().forEach(lifeCyle -> {
try {
- platformClientUtil.getLifeCycleService().addLifeCyle(lifeCyle);
- } catch (VCIError e) {
+ platformClientUtil.getLifeCycleService().addLifeCycle(lifeCyle);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
@@ -491,12 +478,12 @@
* @param lifeCycleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
@Override
- public void batchEditLifeCycle(List<LifeCyle> lifeCycleList) {
+ public void batchEditLifeCycle(List<LifeCycle> lifeCycleList) {
if(!CollectionUtils.isEmpty(lifeCycleList)){
lifeCycleList.stream().forEach(lifeCyle -> {
try {
- platformClientUtil.getLifeCycleService().modifyLifeCyle(lifeCyle);
- } catch (VCIError e) {
+ platformClientUtil.getLifeCycleService().modifyLifeCycle(lifeCyle);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
--
Gitblit v1.9.3