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/OsAttributeServiceImpl.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 7f1354a..f172326 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -1,7 +1,8 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -19,19 +20,16 @@
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.attribpool.AttribItem;
-import plm.corba.attribpool.AttribItemFilter;
import java.util.*;
import java.util.stream.Collectors;
+import static com.vci.client.omd.attribpool.ui.VTDataTypePanel.*;
import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
-import static plm.vo.omd.attribpool.ui.VTDataTypePanel.*;
/**
* 灞炴�ф睜鏈嶅姟 --宸茬粡璋冪敤浜嗗钩鍙扮殑鏈嶅姟锛屽洜姝や笉鍦ㄦ彁渚汥ao灞�
@@ -112,12 +110,12 @@
*/
@Override
public List<OsAttributeVO> selectAllAttribute() {
- AttribItemFilter abFilter = new AttribItemFilter();
//鍚庨潰涓や釜鍒嗛〉鏁帮紝瀹屽叏娌℃湁鐢�
try {
- return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
-// return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+// return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
+// return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
+ return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs("",1,1)).collect(Collectors.toList()));
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -141,7 +139,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsAttributeVO> attributeDO2VOs(Collection<AttribItem> attribItems) {
+ public List<OsAttributeVO> attributeDO2VOs(Collection<AttributeDef> attribItems) {
List<OsAttributeVO> vos = new ArrayList<>();
Optional.ofNullable(attribItems).orElseGet(()->new ArrayList<>()).stream().forEach(attribItem -> {
vos.add(attributeDO2VO(attribItem));
@@ -156,15 +154,15 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsAttributeVO attributeDO2VO(AttribItem attribItem) {
+ public OsAttributeVO attributeDO2VO(AttributeDef attribItem) {
OsAttributeVO attributeVO = new OsAttributeVO();
if(attribItem!=null){
attributeVO.setOid(attribItem.oid);
attributeVO.setId(attribItem.name);
attributeVO.setCreator(attribItem.creator);
try {
- attributeVO.setCreateTime(VciDateUtil.str2Date(attribItem.createTime,VciDateUtil.DateTimeFormat));
- attributeVO.setLastModifyTime(VciDateUtil.str2Date(attribItem.modifyTime,VciDateUtil.DateTimeFormat));
+ attributeVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(attribItem.createTime),VciDateUtil.DateTimeFormat));
+ attributeVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(attribItem.modifyTime),VciDateUtil.DateTimeFormat));
attributeVO.setTs(VciDateUtil.str2Date(attribItem.ts,VciDateUtil.DateTimeMillFormat));
}catch (Throwable e){
@@ -224,14 +222,14 @@
* @return 鏁版嵁瀵硅薄
*/
@Override
- public AttribItem attributeVO2DO(OsAttributeVO attributeVO) {
- AttribItem attribItem = new AttribItem();
+ public AttributeDef attributeVO2DO(OsAttributeVO attributeVO) {
+ AttributeDef attribItem = new AttributeDef();
attribItem.oid = attributeVO.getOid();
attribItem.ts = VciDateUtil.date2Str(attributeVO.getTs(),VciDateUtil.DateTimeFormat);
attribItem.creator = attributeVO.getCreator();
- attribItem.createTime = VciDateUtil.date2Str(attributeVO.getCreateTime(),VciDateUtil.DateTimeFormat);
+ attribItem.createTime = attributeVO.getCreateTime() != null?attributeVO.getCreateTime().getTime():null;
attribItem.modifier = attributeVO.getLastModifier();
- attribItem.modifyTime = VciDateUtil.date2Str(attributeVO.getLastModifyTime(),VciDateUtil.DateTimeFormat);
+ attribItem.modifyTime = attributeVO.getLastModifyTime() != null ? attributeVO.getLastModifyTime().getTime():null;
attribItem.name = attributeVO.getId();
attribItem.label = attributeVO.getName();
attribItem.description = attributeVO.getDescription() == null ?"":attributeVO.getDescription();
@@ -332,12 +330,12 @@
* @param attribItemList 灞炴�х殑鍒楄〃
*/
@Override
- public void batchAddAttribute(List<AttribItem> attribItemList) {
+ public void batchAddAttribute(List<AttributeDef> attribItemList) {
if(!CollectionUtils.isEmpty(attribItemList)){
attribItemList.stream().forEach(attribItem -> {
try {
- platformClientUtil.getAttributeService().addAttribItem(attribItem);
- } catch (VCIError e) {
+ platformClientUtil.getAttributeService().addAttributeDef(attribItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
@@ -349,12 +347,12 @@
* @param editAttrList 灞炴�х殑鍒楄〃
*/
@Override
- public void batchEditAttribute(List<AttribItem> editAttrList) {
+ public void batchEditAttribute(List<AttributeDef> editAttrList) {
if(!CollectionUtils.isEmpty(editAttrList)){
editAttrList.stream().forEach(attribItem -> {
try {
- platformClientUtil.getAttributeService().modifyAbItem(attribItem);
- } catch (VCIError e) {
+ platformClientUtil.getAttributeService().modifyAttributeDef(attribItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
--
Gitblit v1.9.3