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 | 106 +++++++++++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 56 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 c26bb62..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
@@ -1,42 +1,32 @@
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.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;
@@ -102,7 +92,7 @@
* @throws VciBaseException 濡傛灉鐩爣鐢熷懡鍛ㄦ湡鍜屽綋鍓嶇敓鍛藉懆鏈熺姸鎬佹病鏈夎繛鎺ョ嚎鏃舵姏鍑哄紓甯�
*/
@Override
- public void transStatus(BusinessObject bo, String targetStatus)
+ public void transStatus(com.vci.corba.omd.data.BusinessObject bo, String targetStatus)
throws VciBaseException {
WebUtil.alertNotNull(bo,"涓氬姟鏁版嵁瀵硅薄",bo.lctId,"鐢熷懡鍛ㄦ湡缂栫爜",bo.lcStatus,"褰撳墠鐢熷懡鍛ㄦ湡鐘舵��",targetStatus,"鐩爣鐢熷懡鍛ㄦ湡鐘舵��");
OsLifeCycleLineVO transVO = getTransVO(bo.lctId, bo.lcStatus, targetStatus);
@@ -123,10 +113,10 @@
* @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public void transStatus(List<BusinessObject> boList, String targetStatus)
+ public void transStatus(List<com.vci.corba.omd.data.BusinessObject> boList, String targetStatus)
throws VciBaseException {
WebUtil.alertNotNull(boList,"涓氬姟鏁版嵁瀵硅薄",targetStatus,"鐩爣瀵硅薄");
- transStatus(boList.toArray(new BusinessObject[0]), targetStatus);
+ transStatus(boList.toArray(new com.vci.corba.omd.data.BusinessObject[0]), targetStatus);
}
/**
@@ -136,13 +126,13 @@
* @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public void transStatus(BusinessObject[] bos, String targetStatus)
+ public void transStatus(com.vci.corba.omd.data.BusinessObject[] bos, String targetStatus)
throws VciBaseException {
WebUtil.alertNotNull(bos,"涓氬姟鏁版嵁瀵硅薄",targetStatus,"鐩爣瀵硅薄");
List<OsLifeCycleLineVO> transVOList = new ArrayList<>();
- List<BusinessObject> transBOs = new ArrayList<>();
+ List<com.vci.corba.omd.data.BusinessObject> transBOs = new ArrayList<>();
for(int i = 0 ; i < bos.length ; i ++){
- BusinessObject bo = bos[i];
+ com.vci.corba.omd.data.BusinessObject bo = bos[i];
WebUtil.alertNotNull(bo,"涓氬姟鏁版嵁瀵硅薄",bo.lctId,"鐢熷懡鍛ㄦ湡缂栫爜",bo.lcStatus,"褰撳墠鐢熷懡鍛ㄦ湡鐘舵��");
OsLifeCycleLineVO transVO = getTransVO(bo.lctId, bo.lcStatus, targetStatus);
if(transVO!=null){
@@ -155,7 +145,7 @@
}
}
if(!CollectionUtils.isEmpty(transBOs)) {
- batchTransVo(transBOs.toArray(new BusinessObject[0]), transVOList.toArray(new OsLifeCycleLineVO[0]));
+ batchTransVo(transBOs.toArray(new com.vci.corba.omd.data.BusinessObject[0]), transVOList.toArray(new OsLifeCycleLineVO[0]));
}
}
@@ -166,10 +156,10 @@
* @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public void transCboStatus(List<ClientBusinessObject> cboList,
+ public void transCboStatus(List<com.vci.client.bof.ClientBusinessObject> cboList,
String targetStatus) throws VciBaseException {
WebUtil.alertNotNull(cboList,"涓氬姟鏁版嵁瀵硅薄",targetStatus,"鐩爣瀵硅薄");
- BusinessObject[] bos = new BusinessObject[cboList.size()];
+ com.vci.corba.omd.data.BusinessObject[] bos = new com.vci.corba.omd.data.BusinessObject[cboList.size()];
for(int i = 0 ; i < cboList.size() ; i ++){
bos[i] = cboList.get(i).getBusinessObject();
}
@@ -194,7 +184,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsLifeCycleVO> lifeCycleDO2VOs(Collection<LifeCyle> lifeCycles){
+ public List<OsLifeCycleVO> lifeCycleDO2VOs(Collection<LifeCycle> lifeCycles){
List<OsLifeCycleVO> lifeCycleVOS = new ArrayList<>();
Optional.ofNullable(lifeCycles).orElseGet(()->new ArrayList<>()).stream().forEach(lifeCyle -> {
OsLifeCycleVO lifeCycleVO = lifeCycleDO2VO(lifeCyle);
@@ -209,12 +199,12 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsLifeCycleVO lifeCycleDO2VO(LifeCyle lifeCycle){
+ public OsLifeCycleVO lifeCycleDO2VO(LifeCycle lifeCycle){
OsLifeCycleVO life = new OsLifeCycleVO();
Map<String, OsStatusVO> statusVOMap = statusService.selectAllStatusMap();
if(lifeCycle !=null) {
try {
- life.setCreateTime(VciDateUtil.str2Date(lifeCycle.createTime,VciDateUtil.DateTimeFormat));
+ life.setCreateTime(new Date(lifeCycle.createTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -223,7 +213,7 @@
life.setId(lifeCycle.name);
life.setLastModifier(lifeCycle.modifier);
try {
- life.setLastModifyTime(VciDateUtil.str2Date(lifeCycle.modifyTime,VciDateUtil.DateTimeFormat));
+ life.setLastModifyTime(new Date(lifeCycle.modifyTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -243,7 +233,7 @@
}else {
OsLifeCycleLineEventVO[] eventVOs = new OsLifeCycleLineEventVO[route.transitionVOEvents.length];
for (int i = 0; i < route.transitionVOEvents.length; i++) {
- TransitionVOEvent event = route.transitionVOEvents[i];
+ com.vci.corba.omd.lcm.TransitionVOEvent event = route.transitionVOEvents[i];
OsLifeCycleLineEventVO eventVO = new OsLifeCycleLineEventVO();
eventVO.setOid(event.id);
eventVO.setEventFullName(event.name);
@@ -273,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) {
@@ -323,9 +313,10 @@
@VciUnLog
public List<OsLifeCycleVO> selectAllLifeCycle() throws VciBaseException {
try {
- LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
+// LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
+ LifeCycle[] lifeCyles = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycles();
return lifeCycleDO2VOs(Arrays.stream(lifeCyles).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
if(logger.isErrorEnabled()){
// logger.error(vciError.error_code,vciError);
}
@@ -384,12 +375,13 @@
* @throws VciBaseException 璺冭縼鍑洪敊鐨勬槸浼氭姏鍑哄紓甯�
*/
@Override
- public void doTransVO(BusinessObject obj,OsLifeCycleLineVO lineVO) throws VciBaseException {
+ public void doTransVO(com.vci.corba.omd.data.BusinessObject obj,OsLifeCycleLineVO lineVO) throws VciBaseException {
if(lineVO!=null){
try {
- TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
- platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
- } catch (VCIError e) {
+ com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
+// platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
+ ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}else{
@@ -402,21 +394,21 @@
* @param lineVO 杩炴帴绾垮璞�
* @return 骞冲彴鐨勮繛鎺ョ嚎瀵硅薄
*/
- private TransitionVO lifeCycleLineVO2DO(OsLifeCycleLineVO lineVO){
- TransitionVO transitionVO = new TransitionVO();
+ private com.vci.corba.omd.lcm.TransitionVO lifeCycleLineVO2DO(OsLifeCycleLineVO lineVO){
+ com.vci.corba.omd.lcm.TransitionVO transitionVO = new com.vci.corba.omd.lcm.TransitionVO();
transitionVO.id = lineVO.getOid();
transitionVO.source = lineVO.getSourceLifeStatus();
transitionVO.destination = lineVO.getTargetLifeStatus();
transitionVO.connect = lineVO.getName() == null?"":lineVO.getName();
//鍔犱簨浠�
- TransitionVOEvent[] events;
+ com.vci.corba.omd.lcm.TransitionVOEvent[] events;
if(lineVO.getEvents() == null || lineVO.getEvents().length == 0){
- events = new TransitionVOEvent[0];
+ events = new com.vci.corba.omd.lcm.TransitionVOEvent[0];
}else{
- events = new TransitionVOEvent[lineVO.getEvents().length];
+ events = new com.vci.corba.omd.lcm.TransitionVOEvent[lineVO.getEvents().length];
for (int j = 0; j < lineVO.getEvents().length; j++) {
OsLifeCycleLineEventVO eventVO = lineVO.getEvents()[j];
- TransitionVOEvent event = new TransitionVOEvent();
+ com.vci.corba.omd.lcm.TransitionVOEvent event = new com.vci.corba.omd.lcm.TransitionVOEvent();
event.id = eventVO.getOid();
event.name = eventVO.getEventFullName();
events[j] = event;
@@ -433,7 +425,7 @@
* @throws VciBaseException 璺冭縼鍑洪敊鐨勬槸浼氭姏鍑哄紓甯�
*/
@Override
- public void batchTransVo(BusinessObject[] bos,OsLifeCycleLineVO[] vos) throws VciBaseException{
+ public void batchTransVo(com.vci.corba.omd.data.BusinessObject[] bos,OsLifeCycleLineVO[] vos) throws VciBaseException{
batchTransVo(bos,vos,null);
}
@@ -468,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);
}
});
@@ -486,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);
}
});
@@ -605,7 +597,7 @@
* @throws VciBaseException 璺冭縼鍑洪敊鐨勬槸浼氭姏鍑哄紓甯�
*/
@Override
- public void batchTransVo(BusinessObject[] bos,OsLifeCycleLineVO[] lineVOs,String[] releaseStatus) throws VciBaseException{
+ public void batchTransVo(com.vci.corba.omd.data.BusinessObject[] bos,OsLifeCycleLineVO[] lineVOs,String[] releaseStatus) throws VciBaseException{
if(bos!=null && lineVOs != null && lineVOs.length == bos.length){
try {
if(releaseStatus == null){
@@ -614,13 +606,15 @@
releaseStatus[i] = "";
}
}
- TransitionVO[] vos = new TransitionVO[lineVOs.length];
+ com.vci.corba.omd.lcm.TransitionVO[] vos = new com.vci.corba.omd.lcm.TransitionVO[lineVOs.length];
for(int i = 0 ; i < lineVOs.length; i ++){
vos[i] = lifeCycleLineVO2DO(lineVOs[i]);
}
- platformClientUtil.getBOFactoryService().batchTransferBusinessObjectAndRelease(
+// platformClientUtil.getBOFactoryService().batchTransferBusinessObjectAndRelease(
+// bos, vos, releaseStatus);
+ ServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
bos, vos, releaseStatus);
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}else{
--
Gitblit v1.9.3