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/OsStatusServiceImpl.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 29dd8a2..9c4c8e1 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
@@ -1,20 +1,18 @@
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.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;
@@ -30,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;
@@ -85,15 +82,15 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsStatusVO statusDO2VO(StatePool statePool) {
+ public OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool) {
OsStatusVO statusVO = new OsStatusVO();
if(statePool!=null){
statusVO.setOid(statePool.oid);
statusVO.setCreator(statePool.creator);
statusVO.setLastModifier(statePool.modifier);
try {
- statusVO.setCreateTime(VciDateUtil.str2Date(statePool.createTime,VciDateUtil.DateTimeFormat));
- statusVO.setLastModifyTime(VciDateUtil.str2Date(statePool.modifyTime,VciDateUtil.DateTimeFormat));
+ statusVO.setCreateTime(new Date(statePool.createTime));
+ statusVO.setLastModifyTime(new Date(statePool.modifyTime));
statusVO.setTs(VciDateUtil.str2Date(statePool.ts,VciDateUtil.DateTimeMillFormat));
} catch (Exception e) {
e.printStackTrace();
@@ -112,7 +109,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools) {
+ public List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools) {
List<OsStatusVO> statusVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(statePools)){
statePools.stream().forEach(statePool -> {
@@ -132,8 +129,9 @@
@VciUnLog
public List<OsStatusVO> selectAllStatus() {
try {
- return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+// return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
+ return statusDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList()));
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -183,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);
}
}
}
@@ -200,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);
}
}
}
@@ -286,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);
@@ -330,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;
}
@@ -354,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;
--
Gitblit v1.9.3