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/OsLifeCycleServiceImpl.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/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index cd2fce1..7f48730 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.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.lcm.Bound;
 import com.vci.corba.omd.lcm.LifeCycle;
@@ -10,7 +10,6 @@
 import com.vci.starter.web.pagemodel.BaseQueryObject;
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.CacheKeyConstant;
 import com.vci.web.model.OsLifeCycleDO;
 import com.vci.web.pageModel.*;
 import com.vci.web.service.OsLifeCycleServiceI;
@@ -22,8 +21,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;
@@ -32,7 +29,6 @@
 import java.util.stream.Collectors;
 
 import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
 import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
 import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;
 
@@ -314,7 +310,7 @@
 	public List<OsLifeCycleVO> selectAllLifeCycle() throws VciBaseException {
 		try {
 //			LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
-			LifeCycle[] lifeCyles = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycles();
+			LifeCycle[] lifeCyles = ClientServiceProvider.getOMDService().getLifeCycleService().getLifeCycles();
 			return lifeCycleDO2VOs(Arrays.stream(lifeCyles).collect(Collectors.toList()));
 		} catch (PLException vciError) {
 			 if(logger.isErrorEnabled()){
@@ -331,7 +327,6 @@
 	 */
 	@Override
 	@VciUnLog
-	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_LIFE_CYCLE,unless="#result == null")
 	public Map<String,OsLifeCycleVO> selectAllLifeCycleMap() throws VciBaseException{
 		return Optional.ofNullable(self.selectAllLifeCycle()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId(),t->t,(o1,o2)->o1));
 	}
@@ -340,7 +335,6 @@
 	 * 娓呴櫎缂撳瓨
 	 */
 	@Override
-	@CacheEvict(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_LIFE_CYCLE)
 	public void clearCache() {
 
 	}
@@ -380,7 +374,7 @@
 			try {
 				com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
 //				platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
-				ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
+				ClientServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
 			} catch (PLException e) {
 				throw WebUtil.getVciBaseException(e);
 			}
@@ -612,7 +606,7 @@
 				}
 //				platformClientUtil.getBOFactoryService().batchTransferBusinessObjectAndRelease(
 //						bos, vos, releaseStatus);
-				ServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
+				ClientServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
 						bos, vos, releaseStatus);
 			} catch (PLException e) {
 				throw WebUtil.getVciBaseException(e);

--
Gitblit v1.9.3