From 3ff6166ea62799068064845fb083d1abb3d902a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 14:47:42 +0800
Subject: [PATCH] plt-slice属性调整后WEB端引用的旧属性也做了相应的调整
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index b21f501..ad5ea40 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -170,7 +170,7 @@
String userName = WebUtil.getCurrentUserId();
BusinessObject bo = new BusinessObject();
bo.oid = (new ObjectUtility()).getNewObjectID36();
- bo.revisionid = (new ObjectUtility()).getNewObjectID36();
+ bo.revoid = (new ObjectUtility()).getNewObjectID36();
bo.nameoid = (new ObjectUtility()).getNewObjectID36();
bo.btName = boName;
bo.isLastR = true;
@@ -243,7 +243,7 @@
if(cbo !=null){
BusinessObject businessObject = new BusinessObject();
businessObject.oid = new ObjectUtility().getNewObjectID36();
- businessObject.revisionid = new ObjectUtility().getNewObjectID36();
+ businessObject.revoid = new ObjectUtility().getNewObjectID36();
businessObject.nameoid = new ObjectUtility().getNewObjectID36();
businessObject.btName = cbo.btName;
businessObject.isLastR = cbo.isLastR;
@@ -288,7 +288,7 @@
private AttributeValue[] clone(AttributeValue[] newAttrValList) {
AttributeValue[] n = new AttributeValue[newAttrValList.length];
for (int i = 0; i < newAttrValList.length; i++) {
- n[i] = new AttributeValue(newAttrValList[i].attrName,newAttrValList[i].attrVal);
+ n[i] = new AttributeValue(newAttrValList[i].name,newAttrValList[i].value);
}
return n;
}
@@ -614,8 +614,8 @@
AttributeValue[] attributeValueList = new AttributeValue[attributeValues.length];
for (int i = 0; i < attributeValues.length; i++) {
AttributeValue newAttributeValue = new AttributeValue();
- newAttributeValue.attrName = attributeValues[i].attrName;
- newAttributeValue.attrVal = attributeValues[i].attrVal;
+ newAttributeValue.name = attributeValues[i].name;
+ newAttributeValue.value = attributeValues[i].value;
attributeValueList[i] = newAttributeValue;
}
return attributeValueList;
@@ -843,8 +843,8 @@
for (i = 0; i < attrValList.size(); ++i) {
attrVal = (AttributeValue) attrValList.get(i);
- if (attrVal.attrName.toUpperCase().equals(attributeName.toUpperCase())) {
- attrVal.attrVal = attributeValue;
+ if (attrVal.name.toUpperCase().equals(attributeName.toUpperCase())) {
+ attrVal.value = attributeValue;
isExist = true;
break;
}
@@ -852,8 +852,8 @@
if (!isExist) {
attrVal = new AttributeValue();
- attrVal.attrName = attributeName.toUpperCase();
- attrVal.attrVal = attributeValue;
+ attrVal.name = attributeName.toUpperCase();
+ attrVal.value = attributeValue;
attrValList.add(attrVal);
}
@@ -934,30 +934,6 @@
}
//鏀逛负閫掑綊锛屽鐞嗘ā鏉垮妯℃澘鐨勯棶棰�
this.recurReplaceCiMap(qt,replaceLowMap);
- /*Map<String, ConditionItem> ciMap = condition.getCIMap();
- ciMap.forEach((ciId,ci)->{
- if(ci.isLeaf()) {
- LeafInfo lInfo = ci.getLeafInfo();
- String value = lInfo.getValue().getOrdinaryValue();
- if(StringUtils.isNotBlank(value)){
- if(value.contains("#")){
- //绯荤粺鍙橀噺.鏀寔涓�涓�
- //lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
- }else if(value.contains("${")){
- //鏈�${xxxx}鐨勬柟寮�
- if(!CollectionUtils.isEmpty(replaceLowMap)) {
- try {
- lInfo.getValue().setOrdinaryValue(VciBaseUtil.replaceByFreeMarker(value, replaceLowMap));
- }catch (Throwable e){
- logger.error("鍙兘閰嶇疆鏈夐棶棰橈紝鍦ㄨ浆鎹reemarker琛ㄨ揪寮忕殑鏃跺�欙紝娌℃湁鎵惧埌瀵瑰簲鐨勫�硷紝鐩墠琛ㄨ揪寮忎负{}",new String[]{value},e);
- }
- }
- }else if(replaceLowMap.containsKey(value.toLowerCase())){
- lInfo.getValue().setOrdinaryValue(replaceLowMap.get(value.toLowerCase()));
- }
- }
- }
- });*/
}
}catch(PLException e){
logger.error(e.code,e);
@@ -2381,9 +2357,9 @@
if (bo.newAttrValList != null) {
for (int i = 0; i < bo.newAttrValList.length; ++i) {
AttributeValue av = bo.newAttrValList[i];
- if (WebUtil.isNormalAttr(av.attrName)) {
- if(av.attrVal == null){
- av.attrVal = "";
+ if (WebUtil.isNormalAttr(av.name)) {
+ if(av.value == null){
+ av.value = "";
}
newAttr.add(av);
}
--
Gitblit v1.9.3