From d039b89816988e6bed65ac7e5892d12df3e5e604 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 六月 2024 14:12:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index a87274d..2832ab8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
@@ -46,7 +45,7 @@
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- //@Autowired
+ @Autowired
private PlatformClientUtil platformClientUtil;
/**
@@ -209,7 +208,7 @@
public List<OsEnumVO> selectAllEnum() {
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -326,7 +325,6 @@
VciBaseUtil.alertNotNull(oid,"涓氬姟鏁版嵁鐨勪富閿�",btmname,"涓氬姟绫诲瀷");
com.vci.client.bof.ClientBusinessObject cbo = boService.selectCBOByOid(oid, btmname);
String secret = cbo.getAttributeValue("secretGrade");
- //secret = DataSecretEnum.SECRET.getValue() + "";
if(StringUtils.isBlank(secret)){
return new ArrayList<>();
}else{
@@ -360,7 +358,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
+ platformClientUtil.getEnumService().addEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -378,8 +376,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
-// ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
- ServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
+ platformClientUtil.getEnumService().modifyEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
--
Gitblit v1.9.3