From e38f4d12d2b051c42202d8554f4c92020d8be294 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 22 七月 2024 10:10:58 +0800
Subject: [PATCH] 枚举类型导入，部门管理取消唯一标识列
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 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..9f3f54c 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;
@@ -11,9 +10,9 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.model.OsStatusDO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.dto.OsStatusDTO;
+import com.vci.model.OsStatusDO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -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;
@@ -32,9 +29,8 @@
import java.util.*;
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;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
/**
* 鐘舵�佺殑鏈嶅姟
@@ -129,8 +125,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 +134,6 @@
/**
* 娓呴櫎缂撳瓨
*/
- @CacheEvict(value = VCI_OBJECT_SERVICE,key = ALL_STATUS)
@Override
public void clearCache(){
//
@@ -151,7 +145,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 +321,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.10.0