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/OsStatusServiceImpl.java | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java index 9c4c8e1..dc84ea9 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.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.stm.StatePool; import com.vci.starter.web.annotation.log.VciUnLog; @@ -23,8 +23,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; @@ -33,8 +31,6 @@ import java.util.stream.Collectors; import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST; -import static com.vci.web.constant.CacheKeyConstant.ALL_STATUS; -import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE; /** * 鐘舵�佺殑鏈嶅姟 @@ -130,7 +126,7 @@ public List<OsStatusVO> selectAllStatus() { try { // return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList())); - return statusDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList())); + return statusDO2VOs(Arrays.stream(ClientServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList())); } catch (PLException vciError) { throw WebUtil.getVciBaseException(vciError); } @@ -139,7 +135,6 @@ /** * 娓呴櫎缂撳瓨 */ - @CacheEvict(value = VCI_OBJECT_SERVICE,key = ALL_STATUS) @Override public void clearCache(){ // @@ -151,7 +146,6 @@ */ @Override @VciUnLog - @Cacheable(value = VCI_OBJECT_SERVICE,key = ALL_STATUS,unless = "#result == null") public Map<String,OsStatusVO> selectAllStatusMap(){ return Optional.ofNullable(self.selectAllStatus()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId(),t->t,(o1,o2)->o1)); } @@ -328,7 +322,7 @@ statePool.name = statusDTO.getId(); statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription(); String userId = VciBaseUtil.getCurrentUserId(); - long now = VciDateUtil.getTime(VciDateUtil.getNow()); + long now = VciDateUtil.getNowTime(); statePool.creator = userId; statePool.createTime = now; statePool.modifier = userId; -- Gitblit v1.9.3