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 | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 d9f627a..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
@@ -2,7 +2,6 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
@@ -25,14 +24,12 @@
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灞�
@@ -113,12 +110,11 @@
*/
@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.name,1,1)).collect(Collectors.toList()));
- return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs(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);
}
@@ -226,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();
--
Gitblit v1.9.3