From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +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/OsStatusServiceImpl.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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..562ad05 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,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.stm.StatePool;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -23,8 +22,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 +30,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;
/**
* 鐘舵�佺殑鏈嶅姟
@@ -129,8 +124,7 @@
@VciUnLog
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(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -139,7 +133,6 @@
/**
* 娓呴櫎缂撳瓨
*/
- @CacheEvict(value = VCI_OBJECT_SERVICE,key = ALL_STATUS)
@Override
public void clearCache(){
//
@@ -151,7 +144,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 +320,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