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/OsAttributeServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 fc0f144..3d39be0 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,9 @@
package com.vci.web.service.impl;
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;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -116,8 +118,9 @@
//鍚庨潰涓や釜鍒嗛〉鏁帮紝瀹屽叏娌℃湁鐢�
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()));
- } catch (VCIError vciError) {
+// 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()));
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -141,7 +144,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.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,7 +159,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem) {
+ public OsAttributeVO attributeDO2VO(AttributeDef attribItem) {
OsAttributeVO attributeVO = new OsAttributeVO();
if(attribItem!=null){
attributeVO.setOid(attribItem.oid);
--
Gitblit v1.9.3