From 663878fdcd0d44c105888014f4cdf7fc926f609f Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 19 六月 2024 10:27:04 +0800
Subject: [PATCH] 1、去掉client包的相关更改。 2、修改登录鉴权修改。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 450 ++++++++++++++++++++++++++------------------------------
1 files changed, 208 insertions(+), 242 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 11ebca6..f5d358d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -1,9 +1,6 @@
package com.vci.web.service.impl;
-import com.vci.client.bof.ClientBusinessObject;
-import com.vci.client.bof.ClientLinkObject;
-import com.vci.client.bof.RevisionValueObject;
-import com.vci.client.bof.VersionValueObject;
+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.data.LinkObject;
@@ -13,6 +10,7 @@
import com.vci.file.pagemodel.VciFileObjectVO;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.frameworkcore.lcstatuspck.ReleaseDataLCStatus;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.bus.VciChangeDataAfter;
import com.vci.starter.web.annotation.bus.VciChangeDataBefore;
@@ -250,7 +248,7 @@
UIFormDataVO formDataVO = new UIFormDataVO();
replaceMap.put("oid", formQuery.getOid().trim());
if(!formDefineVO.isLinkTypeFlag()) {
- List<com.vci.client.bof.ClientBusinessObject> cbos = null;
+ List<BusinessObject> cbos = null;
if (StringUtils.isNotBlank(queryTemplate)) {
replaceMap.put("oid", formQuery.getOid().trim());
cbos = boService.queryCBOByScheme(queryTemplate, conditionMap, replaceMap, null, queryFieldList.stream().collect(Collectors.toList()));
@@ -259,7 +257,7 @@
cbos = boService.queryCBO(formQuery.getBtmname(), conditionMap, null, queryFieldList.stream().collect(Collectors.toList()));
}
if (!CollectionUtils.isEmpty(cbos)) {
- com.vci.client.bof.ClientBusinessObject cbo = cbos.get(0);
+ BusinessObject cbo = cbos.get(0);
formDataVO.setData(boService.cbo2Map(cbo));
} else {
throw new VciBaseException(DATA_OID_NOT_EXIST);
@@ -394,7 +392,7 @@
if(treeQuery.isQueryRoot()){
//鏄煡璇㈡牴鑺傜偣
- List<com.vci.client.bof.ClientBusinessObject> rootCbos = null;
+ List<BusinessObject> rootCbos = null;
if(StringUtils.isNotBlank(queryTemplate)){
//璇存槑鏄彍鍗曢噷瀹氫箟浜嗘煡璇㈡ā鏉跨殑
rootCbos = boService.queryCBOByScheme(queryTemplate, null, replaceMap);
@@ -430,7 +428,7 @@
return rootTreeList;
}else{
//杩欎釜涓嶆槸璺熻妭鐐癸紝浣嗘槸涓�鑸彧鏄鍔犱竴涓�愮骇鏌ヨ锛屽洜涓哄叏閮ㄦ煡璇㈢殑鏃跺�欙紝鍦ㄦ牴鑺傜偣宸茬粡鍏ㄩ儴鏌ヨ瀹屼簡
- List<com.vci.client.bof.ClientBusinessObject> thisChildren = null;
+ List<BusinessObject> thisChildren = null;
if (StringUtils.isNotBlank(queryTemplate)) {
thisChildren = boService.queryCBOByScheme(queryTemplate, treeQuery.getConditionMap(), replaceMap, null, queryFieldList);
} else {
@@ -545,7 +543,7 @@
*/
private void queryTreeForBO(List<Tree> rootTreeList, String queryTemplate,List<String> queryFieldList,TreeQueryObject treeQueryObject) {
for (Tree rootTree : rootTreeList) {
- List<com.vci.client.bof.ClientBusinessObject> thisChildren = null;
+ List<BusinessObject> thisChildren = null;
Map<String,String> sourceDataMap = rootTree.getAttributes();
sourceDataMap.put("f_oid",rootTree.getOid());
Map<String,String> conditionMap = new HashMap<>();
@@ -592,7 +590,7 @@
* @param parentOid 涓婄骇鐨勪富閿�
* @return 鏍�
*/
- private List<Tree> cbo2Trees(Collection<com.vci.client.bof.ClientBusinessObject> cbos,String valueField,String textField,String parentFieldName,boolean showCheckBox,String parentOid){
+ private List<Tree> cbo2Trees(Collection<BusinessObject> cbos,String valueField,String textField,String parentFieldName,boolean showCheckBox,String parentOid){
final int[] i = {0};
List<Tree> rootList = new ArrayList<>();
List<Tree> children = new ArrayList<>();
@@ -601,7 +599,7 @@
tree.setOid(getValueByExpress(cbo,valueField));
tree.setText(getValueByExpress(cbo,textField));
if(StringUtils.isNotBlank(parentFieldName)){
- tree.setParentId(cbo.getAttributeValue(parentFieldName));
+ tree.setParentId(ObjectTool.getBOAttributeValue(cbo,parentFieldName));
}
tree.setAttributes(boService.cbo2Map(cbo));
tree.setIndex(i[0] + "");
@@ -636,10 +634,10 @@
List<Tree> children = new ArrayList<>();
boAndLOS.stream().forEach(boAndLO->{
Tree tree = new Tree();
- com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
- cbo.setBusinessObject(boAndLO.bo);
- com.vci.client.bof.ClientLinkObject clo = new com.vci.client.bof.ClientLinkObject();
- clo.setLinkObject(boAndLO.lo);
+ BusinessObject cbo = new BusinessObject();
+ cbo = boAndLO.bo;
+ LinkObject clo = new LinkObject();
+ clo = boAndLO.lo;
Map<String,String> cloMap = loService.clo2Map(clo);
Map<String,String> cbo2Map = boService.cbo2Map(cbo);
if(!CollectionUtils.isEmpty(cbo2Map)){
@@ -653,9 +651,9 @@
tree.setParentId(boAndLO.lo.oid + TREE_NODE_ID_SEP + boAndLO.lo.fromOid);
}else {
if (parentFieldName.contains(".")) {
- tree.setParentId(cbo.getAttributeValue(parentFieldName));
+ tree.setParentId(ObjectTool.getBOAttributeValue(cbo,parentFieldName));
} else {
- tree.setParentId(clo.getAttributeValue(parentFieldName));
+ tree.setParentId(ObjectTool.getLOAttributeValue(clo,parentFieldName));
}
}
@@ -680,7 +678,7 @@
* @param fieldExpress 琛ㄨ揪寮忕殑鍊�
* @return 杞崲鍚庣殑鍊�
*/
- private String getValueByExpress(com.vci.client.bof.ClientBusinessObject cbo,String fieldExpress){
+ private String getValueByExpress(BusinessObject cbo,String fieldExpress){
if(StringUtils.isBlank(fieldExpress)){
return "";
}
@@ -691,7 +689,7 @@
List<String> fieldList = VciBaseUtil.str2List(fieldExpress);
StringBuilder sb = new StringBuilder();
fieldList.stream().forEach(field->{
- sb.append(cbo.getAttributeValue(field)).append(" ");
+ sb.append(ObjectTool.getBOAttributeValue(cbo,field)).append(" ");
});
return sb.toString().trim();
}
@@ -872,12 +870,12 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勪細鎶涘嚭寮傚父锛屾垨鑰呬簨浠剁洿鎺ヨ繑鍥炰簡寮傚父
*/
@Override
- public BaseResult callPostEvent(Collection<com.vci.client.bof.ClientBusinessObject> cbos, Collection<com.vci.client.bof.ClientLinkObject> clos, String postEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException{
+ public BaseResult callPostEvent(Collection<BusinessObject> cbos, Collection<LinkObject> clos, String postEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException{
if(CollectionUtils.isEmpty(cbos)){
return BaseResult.success();
}
- String btmType = !CollectionUtils.isEmpty(cbos)?cbos.stream().findFirst().get().getBtmName():null;
- String linkType = !CollectionUtils.isEmpty(clos)?clos.stream().findFirst().get().getLinkObject().ltName:null;
+ String btmType = !CollectionUtils.isEmpty(cbos)?cbos.stream().findFirst().get().btName:null;
+ String linkType = !CollectionUtils.isEmpty(clos)?clos.stream().findFirst().get().ltName:null;
if(StringUtils.isNotBlank(postEvent)){
//鍓嶇疆浜嬩欢
//bean鐨勫悕瀛�#鏂规硶; 鎴栬�呭叏璺緞銆傛渶鍚庝竴涓槸鏂规硶鐨勫悕瀛�
@@ -1063,32 +1061,32 @@
return beforeResult;
}
//灏佽鏁版嵁
- BaseResult<com.vci.client.bof.ClientBusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,false,false,false);
+ BaseResult<BusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,false,false,false);
if(!resultCbo.isSuccess()){
return BaseResult.fail(resultCbo.getMsg(),resultCbo.getMsgObjs());
}
//鎵ц淇濆瓨
BaseResult<Map<String,Object>> result = BaseResult.success();
- com.vci.client.bof.ClientBusinessObject afterCBO = null;
+ BusinessObject afterCBO = null;
try {
- BusinessObject resultBO = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
- afterCBO = new com.vci.client.bof.ClientBusinessObject();
- afterCBO.setBusinessObject(resultBO);
+ BusinessObject resultBO = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj(),false,false);
+ afterCBO = new BusinessObject();
+ afterCBO = resultBO;
result.setObj(boService.cbo2Map(afterCBO));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
- fileObjectService.releasedFile(afterCBO.getBtmName(),afterCBO.getOid(),formDataDTO.getReleaseFileOids());
+ fileObjectService.releasedFile(afterCBO.btName,afterCBO.oid,formDataDTO.getReleaseFileOids());
}
//鍚庣疆浜嬩欢
String afterEvent = formDataDTO.getPostEvent();
try {
- callPostEvent(Arrays.stream(new com.vci.client.bof.ClientBusinessObject[]{afterCBO}).collect(Collectors.toList()),null, afterEvent, VciChangeDocumentTypeEnum.ADD);
+ callPostEvent(Arrays.stream(new BusinessObject[]{afterCBO}).collect(Collectors.toList()),null, afterEvent, VciChangeDocumentTypeEnum.ADD);
}catch (Throwable e){
//璇存槑鍚庣疆浜嬩欢鍑虹幇浜嗛敊璇紝閭ｄ箞灏遍渶瑕佸垹闄や互鍓嶇殑杩欐潯鏁版嵁
try {
- platformClientUtil.getBOFService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
+ platformClientUtil.getBOFService().deleteBusinessObject(afterCBO,1);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1107,7 +1105,7 @@
* @param newVersion 鏂扮増娆�
* @return 鎵ц鐨勭粨鏋�
*/
- private BaseResult<com.vci.client.bof.ClientBusinessObject> wrapperCbo(FormDataDTO formDataDTO,UIFormDefineVO formDefineVO,boolean editFlag,boolean newRevision,boolean newVersion){
+ private BaseResult<BusinessObject> wrapperCbo(FormDataDTO formDataDTO,UIFormDefineVO formDefineVO,boolean editFlag,boolean newRevision,boolean newVersion){
//鎵╁睍灞炴�х殑鍊�
Map<String, String> data = formDataDTO.getData();
Map<String,String> dataLow = new HashMap<>();
@@ -1148,7 +1146,7 @@
if(!result.isSuccess()){
return result;
}
- com.vci.client.bof.ClientBusinessObject cbo = createOrGetCbo(dataLow,baseDataMap,editFlag,newRevision,newVersion);
+ BusinessObject cbo = createOrGetCbo(dataLow,baseDataMap,editFlag,newRevision,newVersion);
return BaseResult.success(cbo);
}
@@ -1158,41 +1156,41 @@
* @return 鍩虹瀵硅薄
*/
@Override
- public BaseModel cbo2BaseModel(com.vci.client.bof.ClientBusinessObject cbo){
+ public BaseModel cbo2BaseModel(BusinessObject cbo){
BaseModel baseModel = new BaseModel();
- baseModel.setOid(cbo.getOid());
- baseModel.setNameOid(cbo.getNameoid());
- baseModel.setRevisionOid(cbo.getRevisionid());
- baseModel.setBtmname(cbo.getBtmName());
- baseModel.setLastR(String.valueOf(cbo.getIsLastR()));
- baseModel.setLastV(String.valueOf(cbo.getIsLastV()));
- baseModel.setFirstR(String.valueOf(cbo.getIsFirstR()));
- baseModel.setFirstV(String.valueOf(cbo.getIsFirstV()));
- baseModel.setCreator(cbo.getCreator());
+ baseModel.setOid(cbo.oid);
+ baseModel.setNameOid(cbo.nameoid);
+ baseModel.setRevisionOid(cbo.revisionid);
+ baseModel.setBtmname(cbo.btName);
+ baseModel.setLastR(String.valueOf(cbo.isLastR));
+ baseModel.setLastV(String.valueOf(cbo.isLastV));
+ baseModel.setFirstR(String.valueOf(cbo.isFirstR));
+ baseModel.setFirstV(String.valueOf(cbo.isFirstV));
+ baseModel.setCreator(cbo.creator);
try {
- baseModel.setCreateTime(new Date(cbo.getCreateTime()));
- baseModel.setLastModifyTime(new Date(cbo.getLastModifyTime()));
- baseModel.setTs(new Date(cbo.getTs()));
+ baseModel.setCreateTime(new Date(cbo.createTime));
+ baseModel.setLastModifyTime(new Date(cbo.modifyTime));
+ baseModel.setTs(new Date(cbo.ts));
// baseModel.setCheckInTime(VciDateUtil.str2Date(cbo.getCheckinTime(), VciDateUtil.DateTimeFormat));
// baseModel.setCheckOutTime(VciDateUtil.str2Date(cbo.getCheckoutTime(), VciDateUtil.DateTimeFormat));
}catch (Throwable e){
}
- baseModel.setLastModifier(cbo.getLastModifier());
- baseModel.setRevisionRule(cbo.getRevisionRule());
- baseModel.setVersionRule(cbo.getVersionRule());
- baseModel.setRevisionSeq(cbo.getRevisionSeq());
- baseModel.setRevisionValue(cbo.getRevisionValue());
- baseModel.setVersionSeq(cbo.getVersionSeq());
- baseModel.setVersionValue(cbo.getVersionValue());
- baseModel.setLcStatus(cbo.getLcStatus());
- baseModel.setId(cbo.getId());
- baseModel.setName(cbo.getName());
- baseModel.setDescription(cbo.getDescription());
- baseModel.setOwner(cbo.getOwner());
+ baseModel.setLastModifier(cbo.modifier);
+ baseModel.setRevisionRule(cbo.revisionRule);
+ baseModel.setVersionRule(cbo.versionRule);
+ baseModel.setRevisionSeq(cbo.revisionSeq);
+ baseModel.setRevisionValue(cbo.revisionValue);
+ baseModel.setVersionSeq(cbo.versionSeq);
+ baseModel.setVersionValue(cbo.versionValue);
+ baseModel.setLcStatus(cbo.lcStatus);
+ baseModel.setId(cbo.id);
+ baseModel.setName(cbo.name);
+ baseModel.setDescription(cbo.description);
+ baseModel.setOwner(cbo.owner);
// baseModel.setCheckInBy(cbo.getCheckinBy());
// baseModel.setCheckOutBy(cbo.getCheckoutBy());
- baseModel.setCopyFromVersion(cbo.getCopyFromVersion());
+ baseModel.setCopyFromVersion(cbo.fromVersion);
return baseModel;
}
@@ -1240,7 +1238,7 @@
* @return 鐗堟湰鐨勫璞�
*/
@Override
- public RevisionValueObject getNextRevision(OsBtmTypeVO btmTypeVO, BaseModel baseModel){
+ public RevisionDataInfo getNextRevision(OsBtmTypeVO btmTypeVO, BaseModel baseModel){
try {
if(baseModel.getRevisionValue() == null){
baseModel.setRevisionValue("");
@@ -1256,10 +1254,10 @@
* @param info corba瀵硅薄
* @return java瀵硅薄
*/
- private RevisionValueObject changeRevisionValueInfoToObject(RevisionDataInfo info) {
- RevisionValueObject object = new RevisionValueObject();
- object.setRevisionVal(info.revisionVal);
- object.setRevisionSeq(info.revisionSeq);
+ private RevisionDataInfo changeRevisionValueInfoToObject(RevisionDataInfo info) {
+ RevisionDataInfo object = new RevisionDataInfo();
+ object.revisionVal = info.revisionVal;
+ object.revisionSeq = info.revisionSeq;
return object;
}
@@ -1270,7 +1268,7 @@
* @return 鐗堟湰鐨勫�煎璞�
*/
@Override
- public VersionValueObject getNextVersion(OsBtmTypeVO btmTypeVO, BaseModel baseModel){
+ public VersionDataInfo getNextVersion(OsBtmTypeVO btmTypeVO, BaseModel baseModel){
try{
return changeRevisionValueInfoToObject(platformClientUtil.getBOFactoryService().getNextVersionValue(WebUtil.getTableName(btmTypeVO.getId()),baseModel.getRevisionOid(),baseModel.getNameOid(),WebUtil.getInt(btmTypeVO.getVersionRule())));
}catch (PLException vciError){
@@ -1283,10 +1281,10 @@
* @param info 鐗堟鐨勫��
* @return java瀵硅薄
*/
- private VersionValueObject changeRevisionValueInfoToObject(VersionDataInfo info) {
- VersionValueObject object = new VersionValueObject();
- object.setVersionVal(info.versionVal);
- object.setVersionSeq(info.versionSeq);
+ private VersionDataInfo changeRevisionValueInfoToObject(VersionDataInfo info) {
+ VersionDataInfo object = new VersionDataInfo();
+ object.versionVal = info.versionVal;
+ object.versionSeq = info.versionSeq;
return object;
}
/**
@@ -1331,25 +1329,25 @@
//灏佽鏁版嵁
List<BusinessObject> addBos = new ArrayList<>();
List<BusinessObject> afterBOs = new ArrayList<>();
- List<com.vci.client.bof.ClientBusinessObject> afterCBOs = new ArrayList<>();
+ List<BusinessObject> afterCBOs = new ArrayList<>();
Map<String,List<String>> releasedFileOids = new HashMap<>();
for(FormDataDTO formDataDTO:formDataDTOList.getFormDataDTOS()) {
- BaseResult<com.vci.client.bof.ClientBusinessObject> resultCbo = wrapperCbo(formDataDTO, formDefineVO, false, false, false);
+ BaseResult<BusinessObject> resultCbo = wrapperCbo(formDataDTO, formDefineVO, false, false, false);
if (!resultCbo.isSuccess()) {
return BaseResult.fail(resultCbo.getMsg(), resultCbo.getMsgObjs());
}
- addBos.add(resultCbo.getObj().getBusinessObject());
+ addBos.add(resultCbo.getObj());
//鎵ц淇濆瓨
if (!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())) {
- releasedFileOids.put(resultCbo.getObj().getOid(),formDataDTO.getReleaseFileOids());
+ releasedFileOids.put(resultCbo.getObj().oid,formDataDTO.getReleaseFileOids());
}
}
try {
BusinessObject[] resultBOs = platformClientUtil.getBOFService().batchCreateBusinessObject(addBos.toArray(new BusinessObject[0]), false, false);
afterBOs = Arrays.stream(resultBOs).collect(Collectors.toList());
Arrays.stream(resultBOs).forEach(bo->{
- com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
- cbo.setBusinessObject(bo);
+ BusinessObject cbo = new BusinessObject();
+ cbo = bo;
afterCBOs.add(cbo);
});
} catch (PLException vciError) {
@@ -1398,25 +1396,25 @@
return beforeResult;
}
//灏佽鏁版嵁
- BaseResult<com.vci.client.bof.ClientBusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,true,false,false);
+ BaseResult<BusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,true,false,false);
if(!resultCbo.isSuccess()){
return BaseResult.fail(resultCbo.getMsg(),resultCbo.getMsgObjs());
}
//鎵ц淇濆瓨
BaseResult<Map<String,Object>> result = BaseResult.success();
try {
- platformClientUtil.getBOFService().updateBusinessObject(resultCbo.getObj().getBusinessObject());
+ platformClientUtil.getBOFService().updateBusinessObject(resultCbo.getObj());
result.setObj(boService.cbo2Map(resultCbo.getObj()));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
- fileObjectService.releasedFile(resultCbo.getObj().getBtmName(),resultCbo.getObj().getOid(),formDataDTO.getReleaseFileOids());
+ fileObjectService.releasedFile(resultCbo.getObj().btName,resultCbo.getObj().oid,formDataDTO.getReleaseFileOids());
}
//鍚庣疆浜嬩欢
String afterEvent = formDataDTO.getPostEvent();
try {
- callPostEvent(Arrays.stream(new com.vci.client.bof.ClientBusinessObject[]{resultCbo.getObj()}).collect(Collectors.toList()), null,afterEvent, VciChangeDocumentTypeEnum.EDIT);
+ callPostEvent(Arrays.stream(new BusinessObject[]{resultCbo.getObj()}).collect(Collectors.toList()), null,afterEvent, VciChangeDocumentTypeEnum.EDIT);
}catch (Throwable e){
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
}
@@ -1443,27 +1441,27 @@
return beforeResult;
}
//灏佽鏁版嵁
- BaseResult<com.vci.client.bof.ClientBusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,false,formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
+ BaseResult<BusinessObject> resultCbo = wrapperCbo(formDataDTO,formDefineVO,false,formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
if(!resultCbo.isSuccess()){
return BaseResult.fail(resultCbo.getMsg(),resultCbo.getMsgObjs());
}
//鎵ц淇濆瓨
BaseResult<Map<String,Object>> result = BaseResult.success();
try {
- BusinessObject bo = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
- com.vci.client.bof.ClientBusinessObject afterCbo = new com.vci.client.bof.ClientBusinessObject();
- afterCbo.setBusinessObject(bo);
+ BusinessObject bo = platformClientUtil.getBOFService().createBusinessObject(resultCbo.getObj(),formDataDTO.isUpVersion()?false:true,formDataDTO.isUpVersion());
+ BusinessObject afterCbo = new BusinessObject();
+ afterCbo = bo;
result.setObj(boService.cbo2Map(afterCbo));
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
- fileObjectService.releasedFile(resultCbo.getObj().getBtmName(),resultCbo.getObj().getOid(),formDataDTO.getReleaseFileOids());
+ fileObjectService.releasedFile(resultCbo.getObj().btName,resultCbo.getObj().oid,formDataDTO.getReleaseFileOids());
}
//鍚庣疆浜嬩欢
String afterEvent = formDataDTO.getPostEvent();
try {
- callPostEvent(Arrays.stream(new com.vci.client.bof.ClientBusinessObject[]{resultCbo.getObj()}).collect(Collectors.toList()), null,afterEvent, VciChangeDocumentTypeEnum.EDIT);
+ callPostEvent(Arrays.stream(new BusinessObject[]{resultCbo.getObj()}).collect(Collectors.toList()), null,afterEvent, VciChangeDocumentTypeEnum.EDIT);
}catch (Throwable e){
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
}
@@ -1493,16 +1491,16 @@
//灏佽鏁版嵁
List<BusinessObject> updateCBOS = new ArrayList<>();
Map<String,List<String>> releasedFileOids = new HashMap<>();
- List<com.vci.client.bof.ClientBusinessObject> afterCBOs = new ArrayList<>();
+ List<BusinessObject> afterCBOs = new ArrayList<>();
for(FormDataDTO formDataDTO:formDataDTOList.getFormDataDTOS()) {
- BaseResult<com.vci.client.bof.ClientBusinessObject> resultCbo = wrapperCbo(formDataDTO, formDefineVO, true, false, false);
+ BaseResult<BusinessObject> resultCbo = wrapperCbo(formDataDTO, formDefineVO, true, false, false);
if (!resultCbo.isSuccess()) {
return BaseResult.fail(resultCbo.getMsg(), resultCbo.getMsgObjs());
}
- updateCBOS.add(resultCbo.getObj().getBusinessObject());
+ updateCBOS.add(resultCbo.getObj());
//鎵ц淇濆瓨
if (!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())) {
- releasedFileOids.put(resultCbo.getObj().getOid(),formDataDTO.getReleaseFileOids());
+ releasedFileOids.put(resultCbo.getObj().oid,formDataDTO.getReleaseFileOids());
}
}
try {
@@ -1540,7 +1538,7 @@
String btmName = deleteDataDTO.getDataList().get(0).getBtmname();
List<String> oidList = deleteDataDTO.getDataList().stream().map(BaseModelDTO::getOid).collect(Collectors.toList());
//鐪嬬湅绾ц仈鍒犻櫎銆傚彧鏈夎嚜宸卞紩鐢ㄨ嚜宸辩殑鏃跺�欏彲浠ョ骇鑱斿垹闄�
- List<com.vci.client.bof.ClientBusinessObject> cbo = null;
+ List<BusinessObject> cbo = null;
if(deleteDataDTO.isCascade()){
//绾ц仈鍒犻櫎
OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
@@ -1559,8 +1557,8 @@
if(CollectionUtils.isEmpty(cbo)){
return BaseResult.fail("娌℃湁鍦ㄧ郴缁熶腑鎵惧埌杩欎簺鏁版嵁锛屾湭鎵ц鍒犻櫎鎿嶄綔");
}
- List<com.vci.client.bof.ClientBusinessObject> finalCbo = cbo;
- Collection<Collection<String>> oidCollections = WebUtil.switchCollectionForOracleIn(finalCbo.stream().map(com.vci.client.bof.ClientBusinessObject::getOid).collect(Collectors.toList()));
+ List<BusinessObject> finalCbo = cbo;
+ Collection<Collection<String>> oidCollections = WebUtil.switchCollectionForOracleIn(finalCbo.stream().map(bo -> bo.oid).collect(Collectors.toList()));
List<OsUsedAttributeVO> usedAttributeVOS = null;
boolean adminCascade = false;
if("admin".equalsIgnoreCase(VciBaseUtil.getCurrentUserId()) && deleteDataDTO.isAdminCascade()){
@@ -1595,7 +1593,7 @@
Map<String,String> conditionMap = new HashMap<>();
conditionMap.put(usedAttributeVO.getId(),QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
if(StringUtils.isNotBlank(usedAttributeVO.getPkBtmType())) {
- List<com.vci.client.bof.ClientBusinessObject> tempCbos = boService.queryCBO(usedAttributeVO.getPkBtmType(), conditionMap);
+ List<BusinessObject> tempCbos = boService.queryCBO(usedAttributeVO.getPkBtmType(), conditionMap);
if(!CollectionUtils.isEmpty(tempCbos)){
finalCbo.addAll(tempCbos);
}
@@ -1608,12 +1606,11 @@
}
VciBaseUtil.switchCollectionForOracleIn(finalCbo).stream().forEach(cbos->{
try {
- platformClientUtil.getBOFService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
+ platformClientUtil.getBOFService().batchDeleteBusinessObject(cbos.toArray(new BusinessObject[0]),1);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
});
- System.out.println("zheshi shazi ");
return BaseResult.success();
}
@@ -1649,7 +1646,7 @@
//璇存槑鍓嶇疆浜嬩欢娌℃湁鎵ц鎴愬姛
return beforeResult;
}
- com.vci.client.bof.ClientLinkObject clo = null;
+ LinkObject clo = null;
String prefix = "";
if(formLinkDataDTO.isDirection()){
prefix = LO_FROM_PREFIX;
@@ -1677,9 +1674,9 @@
}
//鏌ヨfrom绔殑
- com.vci.client.bof.ClientBusinessObject fromCbo = new com.vci.client.bof.ClientBusinessObject();
+ BusinessObject fromCbo = new BusinessObject();
try {
- fromCbo.setBusinessObject(platformClientUtil.getBOFService().readBusinessObject(fromOid,fromBtmName));
+ fromCbo = platformClientUtil.getBOFService().readBusinessObject(fromOid,fromBtmName);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -1692,52 +1689,45 @@
}
});
//灏佽to绔殑
- BaseResult<com.vci.client.bof.ClientBusinessObject> result = wrapperToCbo(formLinkDataDTO,formDefineVO,toOid,toBtmName,boData);
+ BaseResult<BusinessObject> result = wrapperToCbo(formLinkDataDTO,formDefineVO,toOid,toBtmName,boData);
if(!result.isSuccess()){
return BaseResult.fail(result.getMsg(),result.getMsgObjs());
}
- com.vci.client.bof.ClientBusinessObject toCbo = result.getObj();
+ BusinessObject toCbo = result.getObj();
//鍒濆鍖栭摼鎺ョ被鍨嬬殑鍊�
- BaseResult<com.vci.client.bof.ClientLinkObject> resultClo = wrapperOnlyCLO(formLinkDataDTO, loData, formDefineVO, false);
+ BaseResult<LinkObject> resultClo = wrapperOnlyCLO(formLinkDataDTO, loData, formDefineVO, false);
if(!resultClo.isSuccess()){
return BaseResult.fail(resultClo.getMsg(),resultClo.getMsgObjs());
}
clo = resultClo.getObj();
- if(formLinkDataDTO.isDirection()){
- clo.setFromBO(toCbo);
- clo.setToBO(fromCbo);
- } else {
- clo.setFromBO(fromCbo);
- clo.setToBO(toCbo);
- }
//鎵ц淇濆瓨
BusinessObject[] bos = new BusinessObject[1];
- toCbo.dealBusinessObjectNullValue();
- clo.dealLinkObjectNullValue();
- bos[0] = toCbo.getBusinessObject();
+ ObjectTool.dealBusinessObjectNullValue(toCbo);
+ ObjectTool.dealLinkObjectNullValue(clo);
+ bos[0] = toCbo;
try {
- platformClientUtil.getBOFService().createBusinessObjectWithLink(bos,clo.getLinkObject());
+ platformClientUtil.getBOFService().createBusinessObjectWithLink(bos,clo);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formLinkDataDTO.getReleaseFileOids())){
- fileObjectService.releasedFile(formLinkDataDTO.getLinkType(),clo.getOid(),formLinkDataDTO.getReleaseFileOids());
+ fileObjectService.releasedFile(formLinkDataDTO.getLinkType(),clo.oid,formLinkDataDTO.getReleaseFileOids());
}
//鍚庣疆浜嬩欢
String afterEvent = formLinkDataDTO.getPostEvent();
try {
- callPostEvent(null,Arrays.stream(new com.vci.client.bof.ClientLinkObject[]{clo}).collect(Collectors.toList()), afterEvent, VciChangeDocumentTypeEnum.ADD);
+ callPostEvent(null,Arrays.stream(new LinkObject[]{clo}).collect(Collectors.toList()), afterEvent, VciChangeDocumentTypeEnum.ADD);
}catch (Throwable e){
//璇存槑鍚庣疆浜嬩欢鍑虹幇浜嗛敊璇紝閭ｄ箞灏遍渶瑕佸垹闄や互鍓嶇殑杩欐潯鏁版嵁
try {
- platformClientUtil.getBOFService().deleteBusinessObject(toCbo.getBusinessObject(),1);
- platformClientUtil.getBOFService().deleteLinkObject(clo.getLinkObject());
+ platformClientUtil.getBOFService().deleteBusinessObject(toCbo,1);
+ platformClientUtil.getBOFService().deleteLinkObject(clo);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
}
- return BaseResult.success(clo.getOid());
+ return BaseResult.success(clo.oid);
}
/**
@@ -1748,7 +1738,7 @@
* @param editFlag 鏄惁涓虹紪杈�
* @return 閾炬帴绫诲瀷鐨勫唴瀹�
*/
- private BaseResult<com.vci.client.bof.ClientLinkObject> wrapperOnlyCLO(FormLinkDataDTO formLinkDataDTO,Map<String,String> loData,UIFormDefineVO formDefineVO,boolean editFlag){
+ private BaseResult<LinkObject> wrapperOnlyCLO(FormLinkDataDTO formLinkDataDTO,Map<String,String> loData,UIFormDefineVO formDefineVO,boolean editFlag){
Map<String,String> baseDataMap = formLinkDataDTO2MapLow(formLinkDataDTO);
Map<String,String> allDataMap = new HashMap<>();
allDataMap.putAll(loData);
@@ -1764,32 +1754,33 @@
return result;
}
//澶勭悊涓氬姟绫诲瀷寰楀埌鏁版嵁
- ClientLinkObject clo ;
+ LinkObject clo ;
if(editFlag){
try {
LinkObject linkObject = platformClientUtil.getBOFService().readLinkObjectById(formLinkDataDTO.getOid(), formLinkDataDTO.getLinkType());
- clo = new ClientLinkObject();
- clo.setLinkObject(linkObject);
+ clo = new LinkObject();
+ clo = linkObject;
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}else{
- clo = new ClientLinkObject();
+ clo = new LinkObject();
//澶勭悊鍒濆鍖栫殑鏁版嵁
- clo.setOid(VciBaseUtil.getPk());
- clo.setCreator(VciBaseUtil.getCurrentUserId());
- clo.setCreateTime(System.currentTimeMillis());
- clo.setTs(System.currentTimeMillis());
- clo.setLoName(formLinkDataDTO.getLinkType());
+ clo.oid = VciBaseUtil.getPk();
+ clo.creator = VciBaseUtil.getCurrentUserId();
+ clo.createTime = System.currentTimeMillis();
+ clo.ts = System.currentTimeMillis();
+ clo.ltName = formLinkDataDTO.getLinkType();
}
//
- allDataMap.forEach((key,value)->{
+ LinkObject finalClo = clo;
+ allDataMap.forEach((key, value)->{
if(editFlag&&("lastmodifier".equalsIgnoreCase(key) || "lastmodifytime".equalsIgnoreCase(key)
|| "ts".equalsIgnoreCase(key) || "creator".equalsIgnoreCase(key)
|| "createtime".equalsIgnoreCase(key))){
//骞冲彴涓嶈兘浼犻�掕繖涓�
}else{
- loService.setAttribute(clo,key,value);
+ loService.setAttribute(finalClo,key,value);
}
});
return BaseResult.success(clo);
@@ -1805,7 +1796,7 @@
* @param boData to鐨勬暟鎹�
* @return 鍖呭惈鐨勫璞�
*/
- private BaseResult<com.vci.client.bof.ClientBusinessObject> wrapperToCbo(FormLinkDataDTO formLinkDataDTO,UIFormDefineVO formDefineVO,String toOid,String toBtmName,Map<String,String> boData){
+ private BaseResult<BusinessObject> wrapperToCbo(FormLinkDataDTO formLinkDataDTO,UIFormDefineVO formDefineVO,String toOid,String toBtmName,Map<String,String> boData){
Map<String,String> dataLow = new HashMap<>();
boData.forEach((key,value)->{
dataLow.put(key.toLowerCase(),value);
@@ -1832,7 +1823,7 @@
if(!result.isSuccess()){
return result;
}
- com.vci.client.bof.ClientBusinessObject cbo = createOrGetCbo(dataLow,baseDataMap,editFlag,formLinkDataDTO.isToUpRevision(),formLinkDataDTO.isToUpVersion());
+ BusinessObject cbo = createOrGetCbo(dataLow,baseDataMap,editFlag,formLinkDataDTO.isToUpRevision(),formLinkDataDTO.isToUpVersion());
return BaseResult.success(cbo);
}
@@ -1925,41 +1916,41 @@
* @param newVersion 鏄惁鍗囩増娆�
* @return cbo瀵硅薄
*/
- public com.vci.client.bof.ClientBusinessObject createOrGetCbo(Map<String,String> dataLowMap,Map<String,String> baseDataMap,boolean editFlag,boolean newRevision,boolean newVersion){
+ public BusinessObject createOrGetCbo(Map<String,String> dataLowMap,Map<String,String> baseDataMap,boolean editFlag,boolean newRevision,boolean newVersion){
String btmName = baseDataMap.get("btmname");
String oid = baseDataMap.get("oid");
-// ClientBusinessObject cbo = new ClientBusinessObject();
- ClientBusinessObject cbo = new ClientBusinessObject();
+// BusinessObject cbo = new BusinessObject();
+ BusinessObject cbo = new BusinessObject();
String copyfromversion = baseDataMap.get("copyfromversion");
OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
List<String> attributeList = btmTypeVO.getAttributes().stream().map(attribute -> attribute.getId()).collect(Collectors.toList());
if(editFlag || newRevision || newVersion){
try {
- cbo.setBusinessObject(platformClientUtil.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
+ cbo = platformClientUtil.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName);
} catch (PLException vciError) {
throw new VciBaseException("浣跨敤涓婚敭鍦ㄧ郴缁熶腑娌℃湁鏌ヨ鍒版暟鎹�",new String[]{oid},vciError);
}
if(btmTypeVO.isRevisionFlag() && newRevision){
- cbo.setOid(VciBaseUtil.getPk());
- cbo.setCopyFromVersion(copyfromversion);
+ cbo.oid = VciBaseUtil.getPk();
+ cbo.fromVersion = copyfromversion;
if(btmTypeVO.isInputRevisionFlag() && StringUtils.isNotBlank(baseDataMap.getOrDefault("revisionvalue",""))){
//鎵嬪姩鐨勶紝鎵�浠ヤ笉澶勭悊鐗堟湰瑙勫垯浜�
- cbo.setRevisionValue(baseDataMap.get("revisionvalue"));
+ cbo.revisionValue = baseDataMap.get("revisionvalue");
}else{
//璇存槑鏄崌鐗�
BaseModel baseModel = cbo2BaseModel(cbo);
- RevisionValueObject revisionValueObject = getNextRevision(btmTypeVO,baseModel);
- cbo.setRevisionid(VciBaseUtil.getPk());
- cbo.setRevisionSeq((short) revisionValueObject.getRevisionSeq());
- cbo.setRevisionValue(revisionValueObject.getRevisionVal());
- cbo.setIsLastR(true);
- cbo.setIsFirstR(false);
+ RevisionDataInfo revisionValueObject = getNextRevision(btmTypeVO,baseModel);
+ cbo.revisionid = VciBaseUtil.getPk();
+ cbo.revisionSeq = revisionValueObject.revisionSeq;
+ cbo.revisionValue = revisionValueObject.revisionVal;
+ cbo.isLastR = true;
+ cbo.isFirstR = false;
//澶勭悊鐗堟
- cbo.setVersionValue(getFirstVersion(btmTypeVO.getVersionRule()));
- cbo.setVersionRule(btmTypeVO.getVersionRule());
- cbo.setVersionSeq((short) 0);
- cbo.setIsLastV(true);
- cbo.setIsFirstV(true);
+ cbo.versionValue = getFirstVersion(btmTypeVO.getVersionRule());
+ cbo.versionRule = btmTypeVO.getVersionRule();
+ cbo.versionSeq = (short) 0;
+ cbo.isLastV = true;
+ cbo.isFirstV = true;
}
//鍗囩増鐨勬椂鍊欙紝鐢熷懡鍛ㄦ湡鐨勭姸鎬侀渶瑕佹敼鍔ㄥ埌榛樿鐘舵��
if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId())){
@@ -1973,19 +1964,19 @@
if(lifeCycleVO == null || StringUtils.isBlank(lifeCycleVO.oid)){
throw new VciBaseException("{0}閲岀殑鐢熷懡鍛ㄦ湡璁剧疆寰椾笉姝ｇ‘锛屽湪绯荤粺涓病鏈夋壘鍒皗1}杩欎釜鐢熷懡鍛ㄦ湡",new String[]{btmTypeVO.getName(),btmTypeVO.getLifeCycleId()});
}
- cbo.setLcStatus(lifeCycleVO.startState);
+ cbo.lcStatus = lifeCycleVO.startState;
}
}
if(btmTypeVO.isRevisionFlag() && newVersion){
- cbo.setCopyFromVersion(copyfromversion);
- cbo.setOid(VciBaseUtil.getPk());
+ cbo.fromVersion = copyfromversion;
+ cbo.oid = VciBaseUtil.getPk();
//杩欐槸鍗囩増娆★紝涓嶅瓨鍦ㄥ嵆鍗囩増鏈紝鍙堝崌鐗堟鐨勬儏鍐�
BaseModel baseModel = cbo2BaseModel(cbo);
- VersionValueObject versionValueObject = getNextVersion(btmTypeVO,baseModel);
- cbo.setVersionValue(versionValueObject.getVersionVal());
- cbo.setVersionSeq((short) versionValueObject.getVersionSeq());
- cbo.setIsLastV(true);
- cbo.setIsFirstV(false);
+ VersionDataInfo versionValueObject = getNextVersion(btmTypeVO,baseModel);
+ cbo.versionValue = versionValueObject.versionVal;
+ cbo.versionSeq = versionValueObject.versionSeq;
+ cbo.isLastV = true;
+ cbo.isFirstV = false;
//鍗囩増鐨勬椂鍊欙紝鐢熷懡鍛ㄦ湡鐨勭姸鎬侀渶瑕佹敼鍔ㄥ埌榛樿鐘舵��
if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId())){
//鏌ヨ鐢熷懡鍛ㄦ湡
@@ -1998,65 +1989,65 @@
if(lifeCycleVO == null || StringUtils.isBlank(lifeCycleVO.oid)){
throw new VciBaseException("{0}閲岀殑鐢熷懡鍛ㄦ湡璁剧疆寰椾笉姝ｇ‘锛屽湪绯荤粺涓病鏈夋壘鍒皗1}杩欎釜鐢熷懡鍛ㄦ湡",new String[]{btmTypeVO.getName(),btmTypeVO.getLifeCycleId()});
}
- cbo.setLcStatus(lifeCycleVO.startState);
+ cbo.lcStatus = lifeCycleVO.startState;
}
}
}else{
//鎴戜滑闇�瑕佸皢灞炴�у垵濮嬪寲
- if(StringUtils.isBlank(cbo.getOid()) || (newRevision || newVersion)){
- cbo.setOid(VciBaseUtil.getPk());
+ if(StringUtils.isBlank(cbo.oid) || (newRevision || newVersion)){
+ cbo.oid = VciBaseUtil.getPk();
}
- if(StringUtils.isBlank(cbo.getCreator())){
- cbo.setCreator(VciBaseUtil.getCurrentUserId());
+ if(StringUtils.isBlank(cbo.creator)){
+ cbo.creator = VciBaseUtil.getCurrentUserId();
}
- if(cbo.getCreateTime() != 0){
- cbo.setCreateTime(System.currentTimeMillis());
+ if(cbo.createTime != 0){
+ cbo.createTime = System.currentTimeMillis();
}
- if(StringUtils.isBlank(cbo.getOwner())){
- cbo.setOwner(cbo.getCreator());
+ if(StringUtils.isBlank(cbo.owner)){
+ cbo.owner = cbo.creator;
}
- cbo.setTs(System.currentTimeMillis());
- if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId()) && (StringUtils.isBlank(cbo.getLcStatus()) || newRevision || newVersion)){
+ cbo.ts = System.currentTimeMillis();
+ if(StringUtils.isNotBlank(btmTypeVO.getLifeCycleId()) && (StringUtils.isBlank(cbo.lcStatus) || newRevision || newVersion)){
//鏌ヨ鐢熷懡鍛ㄦ湡
OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(btmTypeVO.getLifeCycleId());
if(lifeCycleVO == null || StringUtils.isBlank(lifeCycleVO.getOid())){
throw new VciBaseException("{0}閲岀殑鐢熷懡鍛ㄦ湡璁剧疆寰椾笉姝ｇ‘锛屽湪绯荤粺涓病鏈夋壘鍒皗1}杩欎釜鐢熷懡鍛ㄦ湡",new String[]{btmTypeVO.getName(),btmTypeVO.getLifeCycleId()});
}
- cbo.setLcStatus(lifeCycleVO.getStartStatus());
- cbo.setLctId(btmTypeVO.getLifeCycleId());
+ cbo.lcStatus = lifeCycleVO.getStartStatus();
+ cbo.lctId = btmTypeVO.getLifeCycleId();
}
- if(StringUtils.isBlank(cbo.getBtmName())){
- cbo.setBtmName(btmTypeVO.getId());
+ if(StringUtils.isBlank(cbo.btName)){
+ cbo.btName = btmTypeVO.getId();
}
if(btmTypeVO.isRevisionFlag()){
//瑕佺鐞嗙増鏈�
if(btmTypeVO.isInputRevisionFlag() && StringUtils.isNotBlank(baseDataMap.getOrDefault("revisionvalue",""))){
//鎵嬪姩鐨勶紝鎵�浠ヤ笉澶勭悊鐗堟湰瑙勫垯浜�
- cbo.setRevisionValue(baseDataMap.get("revisionvalue"));
+ cbo.revisionValue = baseDataMap.get("revisionvalue");
}else {
OsRevisionRuleVO ruleVO = revisionRuleServiceI.getRevisionRuleById(btmTypeVO.getRevisionRuleId());
if (ruleVO == null || StringUtils.isBlank(ruleVO.getOid())) {
throw new VciBaseException("{0}閲岀殑鐗堟湰瑙勫垯璁剧疆寰椾笉姝ｇ‘锛屽湪绯荤粺涓病鏈夋壘鍒皗1}杩欎釜鐗堟湰瑙勫垯", new String[]{btmTypeVO.getName(), btmTypeVO.getRevisionRuleId()});
}
- cbo.setRevisionValue(ruleVO.getStartCode());
+ cbo.revisionValue = ruleVO.getStartCode();
}
- if (StringUtils.isBlank(cbo.getNameoid())) {
- cbo.setNameoid(VciBaseUtil.getPk());
+ if (StringUtils.isBlank(cbo.nameoid)) {
+ cbo.nameoid = VciBaseUtil.getPk();
}
- if (StringUtils.isBlank(cbo.getRevisionid())) {
- cbo.setRevisionid(VciBaseUtil.getPk());
+ if (StringUtils.isBlank(cbo.revisionid)) {
+ cbo.revisionid = VciBaseUtil.getPk();
}
- cbo.setIsFirstR(true);
- cbo.setIsLastR(true);
- cbo.setRevisionRule(btmTypeVO.getRevisionRuleId());
- cbo.setRevisionSeq((short) 0);
+ cbo.isFirstR = true;
+ cbo.isLastR = true;
+ cbo.revisionRule = btmTypeVO.getRevisionRuleId();
+ cbo.revisionSeq = (short) 0;
//鐪嬬湅鏄惁闇�瑕佸鐞嗙増娆�
- cbo.setVersionValue(getFirstVersion(btmTypeVO.getVersionRule()));
- cbo.setVersionRule(btmTypeVO.getVersionRule());
- cbo.setVersionSeq((short) 0);
- cbo.setIsLastV(true);
- cbo.setIsFirstV(true);
+ cbo.versionValue = getFirstVersion(btmTypeVO.getVersionRule());
+ cbo.versionRule = btmTypeVO.getVersionRule();
+ cbo.versionSeq = (short) 0;
+ cbo.isLastV = true;
+ cbo.isFirstV = true;
}
}
// Iterator<Map.Entry<String, String>> iterator = baseDataMap.entrySet().iterator();
@@ -2098,18 +2089,12 @@
* @param editFlag 鏄惁涓虹紪杈�
*/
@Override
- public void setValueToCbo(Map<String, String> dataLow, Map<String, String> baseDataLow, com.vci.client.bof.ClientBusinessObject cbo, boolean editFlag){
+ public void setValueToCbo(Map<String, String> dataLow, Map<String, String> baseDataLow, BusinessObject cbo, boolean editFlag){
dataLow.forEach((key,value)->{
if(editFlag&¬SendOnEdit(key)){
//骞冲彴涓嶈兘浼犻�掕繖涓�
}else{
- try {
-// if(!SystemAttribute.bosysAttList().contains(key)){
- cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
-// }
- } catch (PLException vciError) {
- throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
- }
+ ObjectTool.setBOAttributeValue(cbo,key,value);
}
});
baseDataLow.forEach((key,value)->{
@@ -2118,23 +2103,11 @@
}else{
if(editFlag) {
//缂栬緫鐨勬椂鍊欏彲浠ラ兘璁剧疆
- try {
-// if(!SystemAttribute.bosysAttList().contains(key)){
- cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
-// }
- } catch (PLException vciError) {
- throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
- }
+ ObjectTool.setBOAttributeValue(cbo,key,value);
}else{
//鍙渶瑕佸鐞唅d,name,description锛屽瘑绾у嵆鍙紝鍏朵綑鐨勯兘宸茬粡琚缃簡
if(basicFields.contains(key) &&StringUtils.isNotBlank(value)){
- try {
-// if(!SystemAttribute.bosysAttList().contains(key)){
- cbo.setAttributeValueWithNoCheck(key, value, true);
-// }
- } catch (PLException vciError) {
- throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
- }
+ ObjectTool.setBOAttributeValue(cbo,key,value);
}
}
}
@@ -2170,7 +2143,7 @@
//璇存槑鍓嶇疆浜嬩欢娌℃湁鎵ц鎴愬姛
return beforeResult;
}
- com.vci.client.bof.ClientLinkObject clo = null;
+ LinkObject clo = null;
String prefix = formLinkDataDTO.isDirection()?LO_FROM_PREFIX:LO_TO_PREFIX;
String toOid = formLinkDataDTO.isDirection()?formLinkDataDTO.getFoid():formLinkDataDTO.getToid();
String toBtmName = formLinkDataDTO.isDirection()?formLinkDataDTO.getFbtmname():formLinkDataDTO.getTbtmname();
@@ -2188,10 +2161,10 @@
}
});
}
- com.vci.client.bof.ClientBusinessObject toCbo =null;
+ BusinessObject toCbo =null;
if(!CollectionUtils.isEmpty(boData)) {
//灏佽to绔殑
- BaseResult<com.vci.client.bof.ClientBusinessObject> result = wrapperToCbo(formLinkDataDTO, formDefineVO, toOid, toBtmName, boData);
+ BaseResult<BusinessObject> result = wrapperToCbo(formLinkDataDTO, formDefineVO, toOid, toBtmName, boData);
if (!result.isSuccess()) {
return BaseResult.fail(result.getMsg(), result.getMsgObjs());
}
@@ -2199,41 +2172,34 @@
}
//鍒濆鍖栭摼鎺ョ被鍨嬬殑鍊�
- BaseResult<com.vci.client.bof.ClientLinkObject> resultClo = wrapperOnlyCLO(formLinkDataDTO, loData, formDefineVO, true);
+ BaseResult<LinkObject> resultClo = wrapperOnlyCLO(formLinkDataDTO, loData, formDefineVO, true);
if(!resultClo.isSuccess()){
return BaseResult.fail(resultClo.getMsg(),resultClo.getMsgObjs());
}
clo = resultClo.getObj();
- if(toCbo!=null) {
- if (formLinkDataDTO.isDirection()) {
- clo.setFromBO(toCbo);
- } else {
- clo.setToBO(toCbo);
- }
- }
try {
- platformClientUtil.getBOFService().updateLinkObject(clo.getLinkObject());
+ platformClientUtil.getBOFService().updateLinkObject(clo);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
//淇濆瓨to绔垨鑰協rom绔�
try{
- platformClientUtil.getBOFactoryService().updateBusinessObject(toCbo.getBusinessObject());
+ platformClientUtil.getBOFactoryService().updateBusinessObject(toCbo);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formLinkDataDTO.getReleaseFileOids())){
- fileObjectService.releasedFile(formLinkDataDTO.getLinkType(),clo.getOid(),formLinkDataDTO.getReleaseFileOids());
+ fileObjectService.releasedFile(formLinkDataDTO.getLinkType(),clo.oid,formLinkDataDTO.getReleaseFileOids());
}
//鍚庣疆浜嬩欢
String afterEvent = formLinkDataDTO.getPostEvent();
try {
- callPostEvent(null,Arrays.stream(new com.vci.client.bof.ClientLinkObject[]{clo}).collect(Collectors.toList()), afterEvent, VciChangeDocumentTypeEnum.ADD);
+ callPostEvent(null,Arrays.stream(new LinkObject[]{clo}).collect(Collectors.toList()), afterEvent, VciChangeDocumentTypeEnum.ADD);
}catch (Throwable e){
//鍚庣疆浜嬩欢鏈夐棶棰樹簡灏卞彧鑳芥槸杩欐牱浜嗭紝娌″姙娉曟仮澶�
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
}
- return BaseResult.success(clo.getOid());
+ return BaseResult.success(clo.oid);
}
/**
@@ -2249,31 +2215,31 @@
if(deleteLinkDataDTO.getDataList().stream().anyMatch(s->StringUtils.isBlank(s.getOid()) || StringUtils.isBlank(s.getLinkType()))){
throw new VciBaseException("鏈夋暟鎹殑涓婚敭(鎴栭摼鎺ョ被鍨嬶級娌℃湁鍊硷紝鏃犳硶鍒犻櫎");
}
- List<ClientLinkObject> clos = new ArrayList<>();
+ List<LinkObject> clos = new ArrayList<>();
VciBaseUtil.switchListForOracleIn(deleteLinkDataDTO.getDataList()).stream().forEach(linkModelDTOs->{
Map<String,String> conditionMap = new HashMap<>();
conditionMap.put("oid",QueryOptionConstant.IN +"(" + VciBaseUtil.toInSql(linkModelDTOs.stream().map(BaseLinkModelDTO::getOid).toArray(String[]::new)) +")");
- List<ClientLinkObject> clientLinkObjects = loService.queryCLO(linkModelDTOs.get(0).getLinkType(), conditionMap);
- if(!CollectionUtils.isEmpty(clientLinkObjects)){
- clos.addAll(clientLinkObjects);
+ List<LinkObject> LinkObjects = loService.queryCLO(linkModelDTOs.get(0).getLinkType(), conditionMap);
+ if(!CollectionUtils.isEmpty(LinkObjects)){
+ clos.addAll(LinkObjects);
}
});
if(CollectionUtils.isEmpty(clos)){
throw new VciBaseException("浣跨敤涓婚敭娌℃湁鍦ㄧ郴缁熶腑鎵惧埌閾炬帴绫诲瀷鐨勬暟鎹�");
}
- Map<String,List<ClientLinkObject>> fromBtmGroups = clos.stream().collect(Collectors.groupingBy(s->s.getFromBTMName()));
- Map<String,List<ClientLinkObject>> toBtmGroups = clos.stream().collect(Collectors.groupingBy(s->s.getToBTMName()));
- Map<String,List<com.vci.client.bof.ClientBusinessObject>> fromBtmDataGroups = new HashMap<>();
- Map<String,List<com.vci.client.bof.ClientBusinessObject>> toBtmDataGroups = new HashMap<>();
+ Map<String,List<LinkObject>> fromBtmGroups = clos.stream().collect(Collectors.groupingBy(s->s.fromBTName));
+ Map<String,List<LinkObject>> toBtmGroups = clos.stream().collect(Collectors.groupingBy(s->s.toBTName));
+ Map<String,List<BusinessObject>> fromBtmDataGroups = new HashMap<>();
+ Map<String,List<BusinessObject>> toBtmDataGroups = new HashMap<>();
if(!CollectionUtils.isEmpty(fromBtmGroups)){
fromBtmGroups.forEach((btmType,cloList)->{
- List<com.vci.client.bof.ClientBusinessObject> cbos = boService.selectCBOByOidCollection(cloList.stream().map(ClientLinkObject::getFromOid).collect(Collectors.toList()), btmType);
+ List<BusinessObject> cbos = boService.selectCBOByOidCollection(cloList.stream().map(clo -> clo.fromOid).collect(Collectors.toList()), btmType);
fromBtmDataGroups.put(btmType,cbos);
});
}
if(!CollectionUtils.isEmpty(toBtmGroups)){
toBtmGroups.forEach((btmType,cloList)->{
- List<com.vci.client.bof.ClientBusinessObject> cbos = boService.selectCBOByOidCollection(cloList.stream().map(ClientLinkObject::getToOid).collect(Collectors.toList()), btmType);
+ List<BusinessObject> cbos = boService.selectCBOByOidCollection(cloList.stream().map(clo -> clo.toOid).collect(Collectors.toList()), btmType);
toBtmDataGroups.put(btmType,cbos);
});
}
@@ -2288,19 +2254,19 @@
if(attr.toLowerCase().startsWith(LO_FROM_PREFIX)){
fromBtmDataGroups.forEach((btm,cbos)->{
String attrNotPrefix = attr.substring(LO_FROM_PREFIX.length());
- if(!CollectionUtils.isEmpty(cbos) && cbos.stream().anyMatch(s->!attrValue.equalsIgnoreCase(s.getAttributeValue(attrNotPrefix)))){
+ if(!CollectionUtils.isEmpty(cbos) && cbos.stream().anyMatch(s->!attrValue.equalsIgnoreCase(ObjectTool.getBOAttributeValue(s, attrNotPrefix)))){
throw new VciBaseException("鏁版嵁鐨勫唴瀹逛笉鍏佽鍒犻櫎,{0}", new String[]{deleteLinkDataDTO.getCheckNotDeleteMsg()});
}
});
}else if(attr.toLowerCase().startsWith(LO_TO_PREFIX)){
toBtmDataGroups.forEach((btm,cbos)->{
String attrNotPrefix = attr.substring(LO_TO_PREFIX.length());
- if(!CollectionUtils.isEmpty(cbos) && cbos.stream().anyMatch(s->!attrValue.equalsIgnoreCase(s.getAttributeValue(attrNotPrefix)))){
+ if(!CollectionUtils.isEmpty(cbos) && cbos.stream().anyMatch(s->!attrValue.equalsIgnoreCase(ObjectTool.getBOAttributeValue(s, attrNotPrefix)))){
throw new VciBaseException("鏁版嵁鐨勫唴瀹逛笉鍏佽鍒犻櫎,{0}", new String[]{deleteLinkDataDTO.getCheckNotDeleteMsg()});
}
});
}else {
- if (clos.stream().anyMatch(s -> attrValue.equalsIgnoreCase(s.getAttributeValue(attr)))) {
+ if (clos.stream().anyMatch(s -> attrValue.equalsIgnoreCase(ObjectTool.getLOAttributeValue(s,attr)))) {
throw new VciBaseException("鏁版嵁鐨勫唴瀹逛笉鍏佽鍒犻櫎,{0}", new String[]{deleteLinkDataDTO.getCheckNotDeleteMsg()});
}
}
@@ -2309,7 +2275,7 @@
//閾炬帴绫诲瀷鏈韩涓�鑸笉浼氭湁鍏宠仈
List<LinkObject> los = new ArrayList<>();
clos.stream().forEach(clo->{
- los.add(clo.getLinkObject());
+ los.add(clo);
});
try {
platformClientUtil.getBOFactoryService().batchDeleteLinkObject(los.toArray(new LinkObject[0]));
@@ -2319,7 +2285,7 @@
if(deleteLinkDataDTO.isDeleteFromData()){
fromBtmDataGroups.forEach((btm,cbos)->{
try{
- platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.stream().map(com.vci.client.bof.ClientBusinessObject::getBusinessObject).toArray(BusinessObject[] :: new),1);
+ platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.toArray(new BusinessObject[0]),1);
}catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -2328,7 +2294,7 @@
if(deleteLinkDataDTO.isDeleteToData()){
toBtmDataGroups.forEach((btm,cbos)->{
try{
- platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.stream().map(com.vci.client.bof.ClientBusinessObject::getBusinessObject).toArray(BusinessObject[] :: new),1);
+ platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.toArray(new BusinessObject[0]),1);
}catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -2402,7 +2368,7 @@
referConfigVO.setConditionMap(new HashMap<>());
}
- List<com.vci.client.bof.ClientBusinessObject> cbos = null;
+ List<BusinessObject> cbos = null;
String oidFieldName = StringUtils.isNotBlank(referConfigVO.getParentUsedField())?referConfigVO.getParentUsedField():referConfigVO.getValueField();
if(referConfigVO.isSelectAllLevel()) {
String parentOidSql = "";
@@ -2477,7 +2443,7 @@
@Override
public List<Map<String,String>> getDataAttr(String btmname, String oid) {
VciBaseUtil.alertNotNull(btmname,"涓氬姟绫诲瀷鐨勪俊鎭�",oid,"涓氬姟鏁版嵁鐨勪富閿�");
- List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btmname,WebUtil.getOidQuery(oid));
+ List<BusinessObject> cbos = boService.queryCBO(btmname,WebUtil.getOidQuery(oid));
List<Map<String,String>> dataMap = new ArrayList<>();
if(!CollectionUtils.isEmpty(cbos)){
cbos.stream().forEach(cbo->{
--
Gitblit v1.9.3