From 9d003325865fe5adb195a0225be1893eb3d03606 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 16:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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..17970c2 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(VciDateUtil.str2Date(String.valueOf(enumItem.createTime),VciDateUtil.DateTimeFormat));
} catch (Exception e) {
e.printStackTrace();
}
try {
- enumVO.setCreateTime(VciDateUtil.str2Date(enumItem.createTime,VciDateUtil.DateTimeFormat));
+ enumVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(enumItem.createTime),VciDateUtil.DateTimeFormat));
} catch (Exception e) {
e.printStackTrace();
}
@@ -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