From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index c7876ed..231a467 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.portal.data.PLTabButton;
import com.vci.corba.portal.data.PLUILayout;
@@ -146,7 +147,7 @@
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
// portalVIS = platformClientUtil.getPortalService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
for(int i = 0 ; i < portalVIS.length ; i++){
@@ -170,7 +171,7 @@
PortalVI[] portalVIS = null;
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
List<PortalVI> portalVIList = Arrays.stream(portalVIS).filter(portal -> 1 == portal.viType).collect(Collectors.toList());
@@ -372,18 +373,18 @@
if("radio".equalsIgnoreCase(itemVO.getType()) || "checkbox".equalsIgnoreCase(itemVO.getType())
|| "combox".equalsIgnoreCase(itemVO.getType())){
//鐪嬬湅鏈夋病鏈夊崟鐙缃�
- if(StringUtils.isNotBlank(itemXO.getComboxKey())){
- itemVO.setComboxKey(itemXO.getComboxKey());
- if(StringUtils.isNotBlank(itemXO.getComboxItems())){
- List<KeyValue> keyValues = new ArrayList<>();
- VciBaseUtil.str2List(itemXO.getComboxItems()).stream().forEach(temmpKeyValue->{
- KeyValue kv = new KeyValue();
- kv.setKey(temmpKeyValue.split("=")[0]);
- kv.setValue(temmpKeyValue.split("=")[1]);
- keyValues.add(kv);
- });
- itemVO.setData(keyValues);
+// if(StringUtils.isNotBlank(itemXO.getComboxKey())){
+// itemVO.setComboxKey(itemXO.getComboxKey());
+ if(StringUtils.isNotBlank(itemXO.getComboxItems())){
+ List<KeyValue> keyValues = new ArrayList<>();
+ for (String keyValue : itemXO.getComboxItems().split(";")) {
+ KeyValue kv = new KeyValue();
+ String[] split = keyValue.split("\\{");
+ kv.setKey(split[0]);
+ kv.setValue(split[1].substring(0,split[1].length()-1));
+ keyValues.add(kv);
}
+ itemVO.setData(keyValues);
}else{
String attr = itemVO.getField();
if(itemVO.getField().toLowerCase().startsWith("t_oid.")
@@ -421,7 +422,7 @@
PortalVI portalVI = null;
try {
portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
return formDO2VO(portalVI);
@@ -464,7 +465,7 @@
PortalVI[] portalVIS = null;
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
List<PortalVI> portalVIList = Arrays.stream(portalVIS).filter(portal -> 0 == portal.viType).collect(Collectors.toList());
@@ -540,7 +541,7 @@
}else{
try {
formDefineVO = formDO2VO(ServiceProvider.getUIService().getPortalVIById(formOid));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -741,7 +742,7 @@
PortalVI portalVI = null;
try {
portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
return tableDO2VO(portalVI,true);
@@ -783,7 +784,7 @@
try {
// return actionDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLAction()).collect(Collectors.toList()));
return actionDO2VOs(Arrays.stream(ServiceProvider.getUIService().getAllPLAction()).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1033,7 +1034,7 @@
private List<UILayoutVO> listLayoutByContent(String pkContent){
try {
return UILayoutDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLTabPagesByPageDefinationOId(pkContent)).collect(Collectors.toList()),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1158,7 +1159,7 @@
try {
layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
// layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1205,7 +1206,7 @@
if(!QUERY_BY_CACHE){
try {
return uiComponentDO2VO(ServiceProvider.getUIService().getPLPageDefinationById(componentOid),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}else{
@@ -1278,7 +1279,7 @@
try {
componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
//componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1314,7 +1315,7 @@
}else{
try {
tableDefineVO = tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1365,7 +1366,7 @@
}else{
try {
componentVO.setFormDefineVO(formDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId())));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1429,7 +1430,7 @@
}else{
return buttonDefineVOS;
}
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1495,7 +1496,7 @@
params.put(parameter.plKey,parameter.plValue);
}
}
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
buttonVO.setParamVOS(params);
@@ -1559,7 +1560,7 @@
// obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
// obj = ServiceProvider.geT(btmType);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
PLUILayout context = null;
--
Gitblit v1.9.3