From 656d72c983be25f3f967578b4d0373e1f77ecc88 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 26 四月 2024 14:33:30 +0800
Subject: [PATCH] 枚举接口调用更改
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 093d3de..58170e8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,8 +1,8 @@
package com.vci.web.service.impl;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.starter.web.annotation.log.VciUnLog;
-import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -20,15 +20,14 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.util.HtmlUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.corba.enumManager.EnumChild;
-import plm.corba.enumManager.EnumItem;
+import com.vci.corba.omd.etm.EnumChild;
+import com.vci.corba.omd.etm.EnumItem;
import plm.corba.enumManager.EnumItemFilter;
import java.util.*;
@@ -48,8 +47,8 @@
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- @Autowired
- private PlatformClientUtil platformClientUtil;
+ //@Autowired
+ //private PlatformClientUtil platformClientUtil;
/**
* 鐢熷懡鍛ㄦ湡
@@ -153,7 +152,6 @@
return "";
}
-
/**
* 鑾峰彇鏋氫妇鐨勮嫳鏂囧��
* @param enumCode 鏋氫妇鐨勭紪鍙凤紙鑻辨枃鍚嶇О锛�
@@ -213,7 +211,8 @@
EnumItemFilter filter = new EnumItemFilter("");
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEmItems(filter,1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEmItems("",1,1)).collect(Collectors.toList()));
+ //return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEmItems(filter,1,1)).collect(Collectors.toList()));
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -263,15 +262,15 @@
enumVO.setId(enumItem.name);
enumVO.setName(enumItem.label);
enumVO.setEnumValueDataType(enumItem.type);
- enumVO.setLength(enumItem.length);
+ enumVO.setLength((int) enumItem.length);
try {
- enumVO.setLastModifyTime(VciDateUtil.str2Date(enumItem.createTime,VciDateUtil.DateTimeFormat));
+ enumVO.setLastModifyTime(new Date(enumItem.createTime));
} catch (Exception e) {
e.printStackTrace();
}
try {
- enumVO.setCreateTime(VciDateUtil.str2Date(enumItem.createTime,VciDateUtil.DateTimeFormat));
+ enumVO.setCreateTime(new Date(enumItem.createTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -329,7 +328,7 @@
@Override
public List<KeyValue> getDataEnum(String oid, String btmname) {
VciBaseUtil.alertNotNull(oid,"涓氬姟鏁版嵁鐨勪富閿�",btmname,"涓氬姟绫诲瀷");
- ClientBusinessObject cbo = boService.selectCBOByOid(oid, btmname);
+ com.vci.client.bof.ClientBusinessObject cbo = boService.selectCBOByOid(oid, btmname);
String secret = cbo.getAttributeValue("secretGrade");
//secret = DataSecretEnum.SECRET.getValue() + "";
if(StringUtils.isBlank(secret)){
@@ -365,7 +364,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- platformClientUtil.getEnumService().addEmItem(enumItem);
+ ServiceProvider.getOMDService().getEnumService().addEmItem(enumItem);
} catch (VCIError e) {
throw WebUtil.getVciBaseException(e);
}
@@ -383,7 +382,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- platformClientUtil.getEnumService().modifyEmItem(enumItem);
+ ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
} catch (VCIError e) {
throw WebUtil.getVciBaseException(e);
}
--
Gitblit v1.9.3