From eb85010d75785fc759d398ab32f7ce588e388688 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 13 六月 2024 17:47:41 +0800
Subject: [PATCH] 1、文件上传接口修改 2、平台接口修改。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 0384af9..0b852a4 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,6 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
+import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
@@ -11,7 +11,6 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.constant.EnumIdConstant;
import com.vci.web.pageModel.KeyValue;
import com.vci.web.pageModel.OsEnumItemVO;
@@ -26,8 +25,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -36,7 +33,6 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
/**
@@ -213,7 +209,7 @@
public List<OsEnumVO> selectAllEnum() {
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(ClientServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -226,7 +222,6 @@
*/
@Override
@VciUnLog
- @Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_ENUM,unless = "#result ==null")
public Map<String, OsEnumVO> selectAllEnumMap() {
return Optional.ofNullable(self.selectAllEnum()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId().toLowerCase(),t->t,(o1,o2)->o1));
}
@@ -365,7 +360,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
+ ClientServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -384,7 +379,7 @@
enumItemList.stream().forEach(enumItem -> {
try {
// ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
- ServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
+ ClientServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -465,7 +460,6 @@
* 娓呴櫎缂撳瓨
*/
@Override
- @CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_ENUM)
public void clearCache() {
}
--
Gitblit v1.9.3