From dcd238531d8154633b9c1e2188b81e519760a17e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 七月 2024 16:09:45 +0800
Subject: [PATCH] 调整项目结构，统一DTO、VO、PO、BO等对象到plt-web-api模块下，拷贝vci-file-integration、plt-web-api、vci-framework-api、vci-file-api等依赖下的对象到plt-web-api模块下，并取消对这些jar的引用（为了解决同路径同名独享导致打包运行时对象加载出错问题）。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 0b852a4..c9cb8d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,9 +1,10 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -11,11 +12,11 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.EnumIdConstant;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsEnumItemVO;
-import com.vci.web.pageModel.OsEnumVO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.constant.EnumIdConstant;
+import com.vci.pagemodel.KeyValue;
+import com.vci.pagemodel.OsEnumItemVO;
+import com.vci.pagemodel.OsEnumVO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -33,7 +34,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
+import static com.vci.constant.EnumIdConstant.LC_STATUS_SUBFIX;
/**
* 鏋氫妇鏈嶅姟--宸茬粡璋冪敤骞冲彴搴曞眰浜嗭紝涓嶅啀鎻愪緵dao灞�
@@ -46,7 +47,7 @@
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- //@Autowired
+ @Autowired
private PlatformClientUtil platformClientUtil;
/**
@@ -209,7 +210,7 @@
public List<OsEnumVO> selectAllEnum() {
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(ClientServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -324,9 +325,8 @@
@Override
public List<KeyValue> getDataEnum(String oid, String btmname) {
VciBaseUtil.alertNotNull(oid,"涓氬姟鏁版嵁鐨勪富閿�",btmname,"涓氬姟绫诲瀷");
- com.vci.client.bof.ClientBusinessObject cbo = boService.selectCBOByOid(oid, btmname);
- String secret = cbo.getAttributeValue("secretGrade");
- //secret = DataSecretEnum.SECRET.getValue() + "";
+ BusinessObject cbo = boService.selectCBOByOid(oid, btmname);
+ String secret = ObjectTool.getBOAttributeValue(cbo,"secretGrade");
if(StringUtils.isBlank(secret)){
return new ArrayList<>();
}else{
@@ -360,7 +360,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ClientServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
+ platformClientUtil.getEnumService().addEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -378,8 +378,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
-// ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
- ClientServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
+ platformClientUtil.getEnumService().modifyEnumType(enumItem);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
--
Gitblit v1.9.3