From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..d9f627a 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;
@@ -19,7 +21,6 @@
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;
@@ -116,8 +117,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 +143,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 +158,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);
@@ -332,12 +334,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 +351,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