From 1493e9498590ca92fef80dc3b4fdeb6bccd33108 Mon Sep 17 00:00:00 2001 From: hanll02 Date: Fri, 30 Sep 2022 17:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=AF=B9=E8=B1=A1=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E3=80=81=E8=A7=86=E5=9B=BE=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../viewmodel/common/ConvertUtils.java | 241 +----------------- .../viewmodel/common/LinkBeUtils.java | 24 +- .../viewmodel/common/ViewModelActionUtil.java | 5 + .../server/api/GspVoExtendInfoRpcService.java | 38 ++- 4 files changed, 45 insertions(+), 263 deletions(-) diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java index 2cc5652..7e8db3d 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java @@ -114,16 +114,9 @@ public final class ConvertUtils { vm.setCode(String.format("%1$s%2$s", cm.getCode(), AUTO_GEN_VM_SUFFIX)); vm.setName(String.format("%1$s_%2$s", AUTO_GEN_VM_PREFIX, cm.getName())); vm.setSimplifyGen(true); - vm.setIsVirtual(false); //be带出，IsVirtual=false - //vm.PrimayKeyID = cm.PrimayKeyID; - //vm.EntityType = cm.ExtendType; + vm.setIsVirtual(false); vm.setEntityType(cm.getEntityType()); - // todo:时区，临时屏蔽 -// vm.setEnableStdTimeFormat(true); - //vm.ExtendNodeList = cm.ExtendNodeList; -// if (cm.getFkConstraints() != null && cm.getFkConstraints().size() > 0) { -// //vm.FkConstraints.addRange(cm.FkConstraints); -// } + if (DotNetToJavaStringHelper.isNullOrEmpty(voGeneratingAssembly)) { vm.setDotnetGeneratingAssembly(cm.getDotnetGeneratingAssembly()+".Vo"); vm.setGeneratingAssembly(HandleAssemblyNameUtil.convertToJavaPackageName(cm.getDotnetGeneratingAssembly()+".Vo")); @@ -139,8 +132,7 @@ public final class ConvertUtils { vm.setMapping(tempVar); } - // //#region Object -////ORIGINAL LINE: public static GspViewObject toObject(IGspCommonObject cmObject, string pkgName, string metadataId, string parentObjIDElementId, GspVoObjectSourceType sourceType = GspVoObjectSourceType.BeObject) + public static GspViewObject toObject(IGspCommonObject cmObject, String pkgName, String metadataId, String parentObjIDElementId, GspVoObjectSourceType sourceType) { GspViewObject vmObject = new GspViewObject(); @@ -166,10 +158,9 @@ public final class ConvertUtils { vmObject.setName(cmObject.getName()); vmObject.setObjectType(cmObject.getObjectType()); vmObject.setRefObjectName(cmObject.getRefObjectName()); -// vmObject.setLogicDelete(cmObject.getLogicDelete()); + vmObject.setOrderbyCondition(cmObject.getOrderbyCondition()); vmObject.setFilterCondition(cmObject.getFilterCondition()); -// vmObject.setRecordDelData() = cmObject.RecordDelData; vmObject.setIsReadOnly(cmObject.getIsReadOnly()); if (cmObject.getKeys() != null && cmObject.getKeys().size() > 0) { for (int i = 0; i < cmObject.getKeys().size(); i++) { @@ -210,7 +201,6 @@ public final class ConvertUtils { } - //#region 字段相关属性，需额外处理 /** * vo对象转换时，更新字段相关属性 @@ -220,26 +210,17 @@ public final class ConvertUtils { * @param parentObjIDElementId */ -//ORIGINAL LINE: private static void convertObjectSelfInfo(IGspCommonObject cmObject, GspViewObject vmObject, string parentObjIDElementId, GspVoObjectSourceType objSourceType = GspVoObjectSourceType.BeObject) private static void convertObjectSelfInfo(IGspCommonObject cmObject, GspViewObject vmObject, String parentObjIDElementId, GspVoObjectSourceType objSourceType) { List elementList = vmObject.getContainElements().stream().filter(item -> item.getIsVirtual() == false).collect(Collectors.toList()); Map viewElements = elementList.stream().collect(Collectors.toMap(IGspCommonField::getID,item -> item)); java.util.HashMap elementMappings = getElementMappingsDic(elementList); - //① ID字段和Keys更新 + updateIDElement(cmObject, vmObject); updateViewObjectKeys(cmObject, vmObject, parentObjIDElementId); - //② 分级信息HirachyInfo -// GspVoElementSourceType eleSourceType = GetEleSourceType(objSourceType); -// updateHirarchyInfo(cmObject, vmObject, elementMappings, viewElements, eleSourceType); - //③ 列生成规则ColumnGenerateID updateColumnGenerateId(cmObject, vmObject, elementMappings); - //④ 唯一性约束ContainConstraints updateContainConstraints(cmObject, vmObject, elementMappings, viewElements); -// //⑤ 时间戳(创建人等信息) -// updateTimeStampElements(cmObject, vmObject, elementMappings); - //⑥ 状态字段 updateStateElementId(cmObject, vmObject, elementMappings); } @@ -266,19 +247,6 @@ public final class ConvertUtils { */ public static void updateTimeStampElements(IGspCommonObject beObject, GspViewObject viewObj, java.util.HashMap elementMappings) { -// //！！！！爲啥是beObject.StateElementID，StateElementID不是狀態字段麽，時間戳字段用啥 -// if (!DotNetToJavaStringHelper.isNullOrEmpty(beObject.StateElementID) && elementMappings.containsKey(beObject.getCreatorElementID())) { -// viewObj.CreatorElementID = elementMappings.get(beObject.CreatorElementID); -// } -// if (!DotNetToJavaStringHelper.isNullOrEmpty(beObject.StateElementID) && elementMappings.containsKey(beObject.CreatedDateElementID)) { -// viewObj.CreatedDateElementID = elementMappings.get(beObject.CreatedDateElementID); -// } -// if (!DotNetToJavaStringHelper.isNullOrEmpty(beObject.StateElementID) && elementMappings.containsKey(beObject.ModifierElementID)) { -// viewObj.ModifierElementID = elementMappings.get(beObject.ModifierElementID); -// } -// if (!DotNetToJavaStringHelper.isNullOrEmpty(beObject.StateElementID) && elementMappings.containsKey(beObject.ModifiedDateElementID)) { -// viewObj.ModifiedDateElementID = elementMappings.get(beObject.ModifiedDateElementID); -// } } /** @@ -433,85 +401,8 @@ public final class ConvertUtils { * @param elementMappings */ -//ORIGINAL LINE: internal static void UpdateHirarchyInfo(IGspCommonObject cmObject, GspViewObject vmObject, Dictionary elementMappings, Dictionary viewElements, GspVoElementSourceType eleSourceType = GspVoElementSourceType.BeElement) public static void updateHirarchyInfo(IGspCommonObject cmObject, GspViewObject vmObject, java.util.HashMap elementMappings, java.util.HashMap viewElements, GspVoElementSourceType eleSourceType) { -// if (cmObject.HirarchyInfo == null) { -// vmObject.HirarchyInfo = null; -// return; -// } -// -// String targetMetadataId = vmObject.getMapping().getTargetMetadataId(); -// -// var refHirarchyInfo = cmObject.HirarchyInfo.clone(vmObject); -// -// var hirarchyInfo = cmObject.HirarchyInfo.clone(vmObject); -// -// if (refHirarchyInfo.IsDetailElement != null) { -// -// var isDetailElement = refHirarchyInfo.IsDetailElement; -// if (elementMappings.containsKey(isDetailElement.getID())) { -// String voEleId = elementMappings.get(isDetailElement.getID()); -// hirarchyInfo.IsDetailElement = viewElements.get(voEleId); -// } else { -// GspViewModelElement transElement = ToElement(refHirarchyInfo.IsDetailElement, null, targetMetadataId, eleSourceType); -// vmObject.getContainElements().add(transElement); -// hirarchyInfo.IsDetailElement = transElement; -// } -// } -// -// if (refHirarchyInfo.LayerElement != null) { -// -// var layerElement = refHirarchyInfo.LayerElement; -// if (elementMappings.containsKey(layerElement.getID())) { -// String voEleId = elementMappings.get(layerElement.getID()); -// hirarchyInfo.LayerElement = viewElements.get(voEleId); -// } else { -// GspViewModelElement transElement = ToElement(refHirarchyInfo.LayerElement, null, targetMetadataId, eleSourceType); -// vmObject.getContainElements().add(transElement); -// hirarchyInfo.LayerElement = transElement; -// } -// } -// -// if (refHirarchyInfo.PathElement != null) { -// -// var pathElement = refHirarchyInfo.PathElement; -// if (elementMappings.containsKey(pathElement.getID())) { -// String voEleId = elementMappings.get(pathElement.getID()); -// hirarchyInfo.PathElement = viewElements.get(voEleId); -// } else { -// GspViewModelElement transElement = ToElement(refHirarchyInfo.PathElement, null, targetMetadataId, eleSourceType); -// vmObject.getContainElements().add(transElement); -// hirarchyInfo.PathElement = transElement; -// } -// } -// -// if (refHirarchyInfo.ParentElement != null) { -// -// var parentElement = refHirarchyInfo.ParentElement; -// if (elementMappings.containsKey(parentElement.getID())) { -// String voEleId = elementMappings.get(parentElement.getID()); -// hirarchyInfo.ParentElement = viewElements.get(voEleId); -// } else { -// GspViewModelElement transElement = ToElement(refHirarchyInfo.ParentElement, null, targetMetadataId, eleSourceType); -// vmObject.getContainElements().add(transElement); -// hirarchyInfo.ParentElement = transElement; -// } -// } -// -// if (refHirarchyInfo.ParentRefElement != null) { -// -// var parentRefElement = refHirarchyInfo.ParentRefElement; -// if (elementMappings.containsKey(parentRefElement.getID())) { -// String voEleId = elementMappings.get(parentRefElement.getID()); -// hirarchyInfo.ParentRefElement = viewElements.get(voEleId); -// } else { -// GspViewModelElement transElement = ToElement(refHirarchyInfo.ParentRefElement, null, targetMetadataId, eleSourceType); -// vmObject.getContainElements().add(transElement); -// hirarchyInfo.ParentRefElement = transElement; -// } -// } -// -// vmObject.HirarchyInfo = hirarchyInfo; + } private static void convertChildObjects(IGspCommonObject cmObject, GspViewObject vmObject, String pkgName, String metadataId) { @@ -522,7 +413,7 @@ public final class ConvertUtils { vmObject.getContainChildObjects().add(cmChildObject); } } -// + private static void convertContainElements(IGspCommonObject cmObject, GspViewObject vmObject, String pkgName, String metadataId, GspVoObjectSourceType objSourceType) { if (cmObject.getContainElements() == null || cmObject.getContainElements().size() < 1) { return; @@ -549,9 +440,9 @@ public final class ConvertUtils { } } - //#endregion - //#region Element + + public static GspViewModelElement toElement(IGspCommonElement element, String pkgName, String metadataId) { return toElement(element, pkgName, metadataId); } @@ -616,10 +507,6 @@ public final class ConvertUtils { switch (sourceType) { case BeElement: case QoElement: - //vmEle.setColumnID(cmEle.getColumnID()); - //vmEle.setDefaultValue(cmEle.getDefaultValue()); // 20180921_测试用例评审_默认值不带出 - //convertBillCodeConfig(vmEle.BillCodeConfig, cmEle.BillCodeConfig); - //vmEle.setDefaultValueType(cmEle.getDefaultValueType()); vmEle.setIsVirtualViewElement(false); vmEle.setIsVirtual(false); //be带出，IsVirtual=false vmEle.setIsRef(false); @@ -723,10 +610,9 @@ public final class ConvertUtils { return vmAssociation; } - //#endregion - //#endregion - //#region Action + + private static void buildVmActions(BizMgrActionCollection beMgrActions, GspViewModel vm, String pkgName, String metadataId) { if (beMgrActions == null) { return; @@ -840,109 +726,4 @@ public final class ConvertUtils { } -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: - //#endregion -// -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#region Vo -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#endregion -// -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#region Qo -// -// //public static GspViewModel convertQoToViewModel(QueryObject qo, string pkgName, string metadataId, string idElementId, List eleIdList=null) -// //{ -// // QueryNode node = qo.QueryNode; -// // GspViewModel vm = new GspViewModel(); -// -// // // 基本信息 -// // convertQoToVmBasicInfo(qo, vm, pkgName, metadataId); -// -// // // Elements -// // var mainObj = ToObject(node, pkgName, metadataId, null, GspVoObjectSourceType.QoObject); -// -// // if (eleIdList != null && eleIdList.Count > 0) -// // { -// // var elements = mainObj.ContainElements.Clone() as GspElementCollection; -// // mainObj.ContainElements.clear(); -// // foreach (var eleId in eleIdList) -// // { -// // var ve = elements.Find(ele => ele.getID() == eleId) as GspViewModelElement; -// // if (ve == null) -// // { -// // throw new Exception(errorToken + $"结果集中没有id='{eleId}'的字段。" + errorToken); -// // } -// // // 兼容queryNode中字段BelongObject为空问题 -// // ve.Mapping.TargetObjectId = node.getID(); -// // mainObj.ContainElements.add(ve); -// // } -// // } -// -// // // IDElement -// // var columnGenerateId = new GspColumnGenerate(); -// // columnGenerateId.ElementID = idElementId; -// // vm.MainObject.ColumnGenerateID = columnGenerateId; -// -// // vm.MainObject = mainObj; -// -// // // BelongModel递归赋值 -// // vm.MainObject.BelongModel = vm; -// // vm.MainObject.BelongModelID = vm.getID(); -// // SetChildObjectBelongModel(vm.MainObject, vm); -// // return vm; -// //} -// -// -// // private static void convertQoToVmBasicInfo(QueryObject qo, GspViewModel vm, string pkgName, string metadataId) -// // { -// // vm.getID() = Guid.newGuid().ToString(); -// // vm.Code = string.Format("{0}{1}", qo.Code, AUTO_GEN_VM_SUFFIX); -// // vm.Name = string.Format("{0}_{1}", AUTO_GEN_VM_PREFIX, qo.Name); -// // vm.IsVirtual = false; //qo带出，IsVirtual=false -// // vm.Mapping = new ViewModelMapping -// // { -// // //MapType = MappingType.BizEntity, -// // //TargetMetadataType = MetadataType.BizEntity, -// // TargetMetadataPkgName = pkgName, -// // TargetMetadataId = metadataId, -// // TargetObjId = qo.getID() -// // }; -// //} -// -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#endregion -// -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#region Tool -// -// /** -// * 根据输入字段ID列表将co字段转换为vo字段集合 -// * -// * @param co -// * @param eleIdList -// * @param pkgName -// * @param metaId -// * @param sourceType -// * @return -// */ -// -////ORIGINAL LINE: public static GspElementCollection convertPartialElementsToVoElements(IGspCommonObject co, List eleIdList, string pkgName, string metaId, GspVoElementSourceType sourceType = GspVoElementSourceType.BeElement) -// public static GspElementCollection convertPartialElementsToVoElements(IGspCommonObject co, java.util.ArrayList eleIdList, String pkgName, String metaId, GspVoElementSourceType sourceType) { -// GspElementCollection voElements = new GspElementCollection(null); -// if (eleIdList != null && eleIdList.size() > 0) { -// -// for (var eleId : eleIdList) { -// -// var bizElement = co.FindElement(eleId); -// GspViewModelElement voElement = ToElement(bizElement, pkgName, metaId, sourceType); -// voElement.getMapping().setTargetObjectId(co.getID()); -// voElements.add(voElement); -// } -// } -// return voElements; -// } -////C# TO JAVA CONVERTER TODO TASK: There is no preprocessor in Java: -// //#endregion -// //#endregion } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/LinkBeUtils.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/LinkBeUtils.java index e5b90fe..9d3c974 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/LinkBeUtils.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/LinkBeUtils.java @@ -151,7 +151,6 @@ public class LinkBeUtils { } - //#region 对象 public void linkMainObj(GspViewObject viewObj) { // 虚拟对象无映射bizObj @@ -209,21 +208,10 @@ public class LinkBeUtils { // 字段mapping字典 java.util.HashMap elementMappings = ConvertUtils.getElementMappingsDic(elementList); - // ② 分级信息 -// ConvertUtils.UpdateHirarchyInfo(bizObject, viewObj, elementMappings, viewElements); - // ③ 时间戳相关 -// ConvertUtils.UpdateTimeStampElements(bizObject, viewObj, elementMappings); - // ④ID生成规则 + // ID生成规则 ConvertUtils.updateColumnGenerateId(bizObject, viewObj, elementMappings); - // ⑤唯一性约束 -// ConvertUtils.updateContainConstraints(bizObject, viewObj, elementMappings, viewElements); - //// ⑥关联信息-vo多源后，主子表关联不需要联动 - //ConvertUtils.UpdateViewObjectKeys(bizObject, viewObj, parentObjectElementId); } - //#endregion - - //#region 字段 public void linkElements(GspViewObject viewObj) { ArrayList elementList = viewObj.getContainElements().getAllItems(item -> item.getIsVirtual() == false); @@ -259,7 +247,6 @@ public class LinkBeUtils { public void linkElementBasicInfo(GspViewModelElement ele, GspBizEntityElement bizElement) { boolean canEditLengthAndPrecision = true; -// ele.setBillCodeConfig(bizElement.getBillCodeConfig().clone()); if (ele.getMDataType() != bizElement.getMDataType()) { ele.setMDataType(bizElement.getMDataType()); canEditLengthAndPrecision = false; @@ -388,8 +375,7 @@ public class LinkBeUtils { if (transElement.getChildAssociations() == null || transElement.getChildAssociations().size() == 0) { throw new RuntimeException(errorToken + String.format("当前字段'%1$s'，对象类型为关联，却无关联信息，请联系管理员。", ele.getName()) + errorToken); } - // 目前策略：关联信息全部带出 - // 若关联模型未改变，则关联只处理带出字段 + for (GspAssociation transAssociation : transElement.getChildAssociations()) { transAssociation.setBelongElement(ele); GspAssociation currentAsso = getAssociation(currentAssos, transAssociation.getId()); @@ -452,9 +438,9 @@ public class LinkBeUtils { } return null; } - //#endregion - //#region 操作 + + public void linkActions(GspViewModel vm) { ArrayList list = vm.getActions().getAllItems(item -> item.getType() == ViewModelActionType.BEAction); @@ -510,7 +496,7 @@ public class LinkBeUtils { return null; } - //ORIGINAL LINE: public GspBizEntityElement getBizElement(ViewModelMapping mapping, string elementLabelId = "") + public GspBizEntityElement getBizElement(ViewModelMapping mapping) { return getBizElement(mapping, ""); } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ViewModelActionUtil.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ViewModelActionUtil.java index 87dfa6a..330e9d5 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ViewModelActionUtil.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ViewModelActionUtil.java @@ -24,6 +24,11 @@ import io.iec.edp.caf.commons.utils.SpringBeanUtils; import java.util.Iterator; import java.util.UUID; +/** + * 视图对象动作工具类 + * + * @author hanll02 + */ public class ViewModelActionUtil { private static final String BEID="beId"; private static final String PROCESSCATEGORY="processCategory"; diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/voextendinfo/server/api/GspVoExtendInfoRpcService.java b/view-object-model/src/main/java/com/inspur/edp/formserver/voextendinfo/server/api/GspVoExtendInfoRpcService.java index d7cb249..cc8baff 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/voextendinfo/server/api/GspVoExtendInfoRpcService.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/voextendinfo/server/api/GspVoExtendInfoRpcService.java @@ -7,44 +7,54 @@ import io.iec.edp.caf.rpc.api.annotation.GspServiceBundle; import io.iec.edp.caf.rpc.api.annotation.RpcParam; import java.util.List; - +/** + * Vo扩展Rpc服务接口 + * + * @author hanll02 + */ @GspServiceBundle(applicationName = "runtime", serviceUnitName = "Lcm", serviceName = "GspVoExtendInfoRpcService") public interface GspVoExtendInfoRpcService { /** - * 根据ID获取某条Vo扩展信息 - * @param id - * @return + * 根据Vo元数据id获取指定id的Vo扩展信息 + * + * @param id Vo元数据id + * @return 指定id的Vo扩展信息 */ GspVoExtendInfo getVoExtendInfo(@RpcParam(paramName = "id")String id); /** - * 根据configId获取某条Vo扩展信息 - * @param configId - * @return + * 根据Vo元数据configid获取指定configid的Vo扩展信息 + * + * @param configId configid + * @return 指定configid的Vo扩展信息 */ GspVoExtendInfo getVoExtendInfoByConfigId(@RpcParam(paramName = "configId")String configId); /** - * 获取所有BE扩展信息 - * @return + * 获取所有Be扩展信息 + * + * @return 所有Be扩展信息列表 */ List getVoExtendInfos(); /** - * 根据BEId获取某条VoID - * @param beId - * @return + * 根据beId获取对应的VoId + * + * @param beId Be元数据id + * @return 指定Be元数据id对应的所有的Vo扩展信息列表 */ List getVoId(@RpcParam(paramName = "beId")String beId); /** * 保存 - * @param infos + * + * @param infos 要保存的Vo扩展信息 */ void saveGspVoExtendInfos(List infos); /** * 根据id删除数据 - * @param id + * + * @param id 要删除的数据id */ void deleteVoExtendInfo(String id); } -- Gitee