From c5ea838fef2a6e4fc3940009ee938fbfa29551b5 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 03 六月 2024 14:53:49 +0800
Subject: [PATCH] 1、平台JAR上传
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index a5f1944..5896187 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -1,6 +1,8 @@
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.btm.BizType;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -12,22 +14,18 @@
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.pageModel.*;
import com.vci.web.service.*;
-import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
+import com.vci.web.util.*;
import org.apache.commons.lang3.StringUtils;
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.corba.btm.BtmItem;
import java.util.*;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
@@ -48,8 +46,8 @@
/**
* 骞冲彴鐨勮皟鐢ㄥ伐鍏风被
*/
- @Autowired
- private PlatformClientUtil platformClientUtil;
+ //@Autowired
+ //private PlatformClientUtil platformClientUtil;
/**
* 灞炴�х殑鏈嶅姟
@@ -82,6 +80,7 @@
@Autowired(required = false)
@Lazy
private OsBtmServiceI self;
+
/**
* 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷
*
@@ -91,9 +90,11 @@
@VciUnLog
public List<OsBtmTypeVO> selectAllBtm() {
try {
- return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
- } catch (VCIError vciError) {
- throw WebUtil.getVciBaseException(vciError);
+ // return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
+// return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
+ return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getBizTypes("")).collect(Collectors.toList()));
+ } catch (PLException e) {
+ throw new RuntimeException(e);
}
}
@@ -116,7 +117,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsBtmTypeVO> btmDO2VOs(Collection<BtmItem> btmItems) {
+ public List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems) {
List<OsBtmTypeVO> VOS = new ArrayList<>();
Optional.ofNullable(btmItems).orElseGet(()->new ArrayList<>()).stream().forEach(btmItem -> {
OsBtmTypeVO vo = btmDO2VO(btmItem);
@@ -132,22 +133,24 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsBtmTypeVO btmDO2VO(BtmItem btmItem) {
+ public OsBtmTypeVO btmDO2VO(BizType btmItem) {
OsBtmTypeVO vo = new OsBtmTypeVO();
if(btmItem !=null){
vo.setOid(btmItem.oid);
vo.setCreator(btmItem.creator);
vo.setLastModifier(btmItem.modifier);
try {
- vo.setCreateTime(VciDateUtil.str2Date(btmItem.createTime,VciDateUtil.DateTimeFormat));
- vo.setLastModifyTime(VciDateUtil.str2Date(btmItem.modifyTime,VciDateUtil.DateTimeFormat));
- vo.setTs(VciDateUtil.str2Date(btmItem.ts,VciDateUtil.DateTimeMillFormat));
+ // btmItem.createTime鎷垮埌鐨勬槸鏃堕棿鎴筹紝浣嗘槸杩欏効瑕佺殑鏄緥濡�2017-12-27 09:32:20.034杩欐牱鐨勬牸寮忥紝鎵�浠ヤ笉璋冪敤杩欎釜鏂规硶锛屾敼璋冪敤鍏朵粬鏂规硶
+ //vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
+ vo.setCreateTime(Func.parse(btmItem.createTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
+ vo.setLastModifyTime( Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
+ vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
} catch (Exception e) {
e.printStackTrace();
}
vo.setDescription(btmItem.description);
vo.setId(btmItem.name);
- vo.setName(btmItem.label);
+ vo.setName(btmItem.label);
vo.setLifeCycleId(btmItem.lifeCycle);
vo.setAbstractFlag(btmItem.isAbstract);
vo.setImplClass(btmItem.implClass);
--
Gitblit v1.9.3