diff --git a/pom.xml b/pom.xml index 6946a2da8a989f954682361c354b3595fffb5874..ebcee7467187dbb2703ce99025652575cf7e3f4a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,13 +55,16 @@ 0.2.0 0.3.34 0.3.23 - 0.1.23 0.1.3 0.1.0 0.1.7 0.3.4 0.1.2 - 0.1.0 + 0.1.0 + 0.1.1 + 0.1.0 + 0.1.0 + 0.1.40-SNAPSHOT @@ -100,46 +103,15 @@ caf-cef-schema-base ${caf.cef.schema.version} - - com.inspur.edp - lcm-metadata-api - ${lcm.metadata.version} - - - com.inspur.edp - lcm-metadata-spi - ${lcm.metadata.spi.version} - - - com.inspur.edp - metadata-to-java-core - ${lcm.metadata.version} - - - com.inspur.edp - metadata-to-java-context - 0.1.4 - - - com.inspur.edp - metadata-rtcustomization-spi - ${metadata.rtcustomization.version} - - - com.inspur.edp - metadata-rtcustomization-api - 0.1.36 - + + com.inspur.edp metadata-deploy-api ${metadata.deploy.version} - - com.inspur.edp - metadata-service-dev-api - 0.1.1 - + + io.iec.edp caf-caching @@ -180,11 +152,6 @@ wf-runtime-api ${wf-runtime-api.version} - - com.inspur.edp - metadata-rtcustomization-server-api - ${metadata-rtcustomization-server-api.version} - com.inspur.edp metadata-businesstype-api @@ -208,12 +175,42 @@ com.inspur.edp metadata-service-dev-spi - ${metadata-service-dev-spi.version} + ${metadata-service-dev.version} + + + com.inspur.edp + metadata-common + ${metadata-common.version} com.inspur.edp metadata-service-dev-api - 0.1.1 + ${metadata-service-dev-api.version} + + + com.inspur.edp + metadata-service-dev-common + ${metadata-service-dev.version} + + + com.inspur.edp + metadata-service-api + ${metadata-service.version} + + + com.inspur.edp + metadata-service-common + ${metadata-service.version} + + + com.inspur.edp + metadata-service-spi + ${metadata-service.version} + + + com.inspur.edp + lcm-metadata-api + ${metadata-api.version} diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index d343b24d595fb98acbaeca8e5998f9777f3c98dc..47967bcc3a6c34798dcfc48e0965b1b9eec00b65 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -31,10 +31,7 @@ 0.1.2 - - com.inspur.edp - metadata-service-dev-api - + com.inspur.edp view-object-model @@ -54,19 +51,19 @@ com.inspur.edp - common-model + caf-cef-rt-api com.inspur.edp - lcm-metadata-api + caf-cef-rt-spi com.inspur.edp - caf-cef-rt-api + metadata-common com.inspur.edp - caf-cef-rt-spi + metadata-service-dev-api com.inspur.edp @@ -74,8 +71,22 @@ com.inspur.edp - metadata-rtcustomization-api + metadata-service-api + + + com.inspur.edp + metadata-service-spi + + + com.inspur.edp + metadata-service-common + + com.inspur.edp + metadata-service-dev-common + + + com.inspur.edp metadata-deploy-api @@ -129,10 +140,6 @@ com.inspur.edp caf-cef-dt-spi - - com.inspur.edp - metadata-rtcustomization-server-api - com.inspur.edp bff-engine-core @@ -144,10 +151,6 @@ 0.1.5 - - com.inspur.edp - metadata-rtcustomization-spi - com.inspur.edp task-api @@ -165,5 +168,14 @@ com.inspur.edp common-model + + com.inspur.edp + lcm-metadata-api + + + com.inspur.edp + lcm-mimic-api + 0.1.0 + diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index 59f91889442b8f59a89993a9a925edf0d9514796..c2d4ef5bb3b591248ceb53992e959f1f17c89be2 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -71,12 +71,23 @@ com.inspur.edp - metadata-rtcustomization-spi - 0.1.9 + metadata-common com.inspur.edp - lcm-metadata-spi + metadata-service-dev-api + + + com.inspur.edp + metadata-service-dev-spi + + + com.inspur.edp + metadata-service-api + + + com.inspur.edp + metadata-service-spi io.iec.edp @@ -85,13 +96,23 @@ com.inspur.edp - lcm-metadata-api - 0.1.40 + metadata-common + + + com.inspur.edp + metadata-service-dev-api + + + com.inspur.edp + metadata-service-dev-spi + + + com.inspur.edp + metadata-service-api com.inspur.edp - metadata-rtcustomization-api - 0.1.36 + metadata-service-spi com.inspur.edp 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 96b12b9fb4758016be913454fa1e31a056dda085..e509a3103254d46bf5d7a6d7f95af759f5ff94e9 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 @@ -40,6 +40,7 @@ import com.inspur.edp.das.commonmodel.entity.GspCommonElement; import com.inspur.edp.das.commonmodel.entity.element.ElementCodeRuleConfig; import com.inspur.edp.das.commonmodel.entity.object.GspUniqueConstraint; import com.inspur.edp.das.commonmodel.util.HandleAssemblyNameUtil; +import com.inspur.edp.das.commonmodel.util.MetadataProjectUtil; import com.inspur.edp.formserver.viewmodel.DotNetToJavaStringHelper; import com.inspur.edp.formserver.viewmodel.GspViewModel; import com.inspur.edp.formserver.viewmodel.GspViewModelElement; @@ -55,6 +56,7 @@ import com.inspur.edp.formserver.viewmodel.common.mapping.GspVoObjectMapping; import com.inspur.edp.formserver.viewmodel.common.mapping.GspVoObjectSourceType; import com.inspur.edp.formserver.viewmodel.exception.ViewModelException; import com.inspur.edp.formserver.viewmodel.exception.VoModelErrorCodes; +import io.iec.edp.caf.commons.utils.StringUtils; import lombok.var; import java.util.ArrayList; @@ -71,9 +73,8 @@ import java.util.stream.Collectors; * @Version: V1.0 */ public final class ConvertUtils { - private static String AUTO_GEN_VM_PREFIX = "GenVo"; - private static String AUTO_GEN_VM_SUFFIX = "Service"; - private static String errorToken = "#GspBefError# "; + private static final String AUTO_GEN_VM_PREFIX = "GenVo"; + private static final String AUTO_GEN_VM_SUFFIX = "Service"; public static GspViewModel convertToViewModel(GspBusinessEntity be, String pkgName, String metadataId) { return convertToViewModel(be, pkgName, metadataId, ""); @@ -81,7 +82,7 @@ public final class ConvertUtils { public static GspViewModel convertToViewModel(GspBusinessEntity be, String pkgName, String metadataId, String voGeneratingAssembly) { //① CM结构构造 - GspViewModel vm = convertToGspViewModel(be, pkgName, metadataId, voGeneratingAssembly); + GspViewModel vm = convertToGspViewModel(be, pkgName, metadataId, voGeneratingAssembly, null); vm.getMapping().setMapType(MappingType.BizEntity); //② BeMgrAction构造 var beMgrActions = be.getCustomMgrActions(); //be.GetCustomMgrActions(); @@ -91,10 +92,22 @@ public final class ConvertUtils { return vm; } - private static GspViewModel convertToGspViewModel(IGspCommonModel cm, String pkgName, String metadataId, String voGeneratingAssembly) { + public static GspViewModel convertToViewModel(GspBusinessEntity be, String pkgName, String metadataId, String voGeneratingAssembly, String relativePath) { + //① CM结构构造 + GspViewModel vm = convertToGspViewModel(be, pkgName, metadataId, voGeneratingAssembly, relativePath); + vm.getMapping().setMapType(MappingType.BizEntity); + //② BeMgrAction构造 + var beMgrActions = be.getCustomMgrActions(); //be.GetCustomMgrActions(); + buildVmActions(beMgrActions, vm, pkgName, metadataId); + + vm.setIsUseNamespaceConfig(true); + return vm; + } + + private static GspViewModel convertToGspViewModel(IGspCommonModel cm, String pkgName, String metadataId, String voGeneratingAssembly, String relativePath) { GspViewModel vm = new GspViewModel(); //① BasicInfo - convertBasicInfo(cm, vm, pkgName, metadataId, voGeneratingAssembly); + convertBasicInfo(cm, vm, pkgName, metadataId, voGeneratingAssembly, relativePath); //② MainObject vm.setMainObject(toObject(cm.getMainObject(), pkgName, metadataId, null, GspVoObjectSourceType.BeObject)); //③ BelongModel递归赋值 @@ -123,7 +136,7 @@ public final class ConvertUtils { } } - private static void convertBasicInfo(IGspCommonModel cm, GspViewModel vm, String pkgName, String metadataId, String voGeneratingAssembly) { + private static void convertBasicInfo(IGspCommonModel cm, GspViewModel vm, String pkgName, String metadataId, String voGeneratingAssembly, String relativePath) { vm.setID(Guid.newGuid().toString()); 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())); @@ -132,6 +145,10 @@ public final class ConvertUtils { //vm.PrimayKeyID = cm.PrimayKeyID; //vm.EntityType = cm.ExtendType; vm.setEntityType(cm.getEntityType()); + String packagePrefix = null; + if (relativePath != null) { + packagePrefix = MetadataProjectUtil.getPackagePrefix(relativePath); + } // todo:时区，临时屏蔽 // vm.setEnableStdTimeFormat(true); //vm.ExtendNodeList = cm.ExtendNodeList; @@ -143,7 +160,11 @@ public final class ConvertUtils { vm.setGeneratingAssembly(HandleAssemblyNameUtil.convertToJavaPackageName(cm.getDotnetGeneratingAssembly() + ".Vo")); } else { vm.setDotnetGeneratingAssembly(voGeneratingAssembly + ".Vo"); - vm.setGeneratingAssembly(HandleAssemblyNameUtil.convertToJavaPackageName(voGeneratingAssembly + ".Vo")); + if (packagePrefix != null) { + vm.setGeneratingAssembly(HandleAssemblyNameUtil.convertToJavaPackageName(packagePrefix, voGeneratingAssembly + ".Vo")); + } else { + vm.setGeneratingAssembly(HandleAssemblyNameUtil.convertToJavaPackageName(voGeneratingAssembly + ".Vo")); + } } ViewModelMapping tempVar = new ViewModelMapping(); tempVar.setMapType(MappingType.BizEntity); @@ -842,7 +863,5 @@ public final class ConvertUtils { throw new ViewModelException(VoModelErrorCodes.GSP_VIEWOBJECT_MODEL_1008, null, param.getParamCode(), param.getParamName(), param.getParameterType().toString()); } - - } } \ No newline at end of file diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml index 0c6e8b5c549a990b769e2429adbd6d0f0734223c..044c8e3a4500a81f473c51d52276c3f7d8b73457 100644 --- a/view-object-rtwebapi/pom.xml +++ b/view-object-rtwebapi/pom.xml @@ -34,8 +34,27 @@ com.inspur.edp - lcm-metadata-common - 0.1.30 + metadata-common + + + com.inspur.edp + metadata-service-dev-api + + + com.inspur.edp + metadata-service-dev-spi + + + com.inspur.edp + metadata-service-api + + + com.inspur.edp + metadata-service-spi + + + com.inspur.edp + metadata-service-common diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index 05b00484f9b4cba6bd9fe8c84c8efb46930405e7..6e24a383d952b7112343af9a83ce3a592b6301da 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -56,7 +56,23 @@ com.inspur.edp - lcm-metadata-api + metadata-common + + + com.inspur.edp + metadata-service-dev-api + + + com.inspur.edp + metadata-service-dev-spi + + + com.inspur.edp + metadata-service-api + + + com.inspur.edp + metadata-service-spi com.inspur.edp diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java index caa51584d118a9917a53081289ee916e41dc9ff6..ef030a4074807f8d72b6c15483f58b79da541e69 100644 --- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java +++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java @@ -173,7 +173,10 @@ public class ViewModelController { if (!CheckInfoUtil.checkNull(node.get("bePkgName"))) { bePkgName = node.get("bePkgName").textValue(); } - + String relativePath = null; + if (!CheckInfoUtil.checkNull(node.get("relativePath"))) { + relativePath = node.get("relativePath").textValue(); + } String enableProcessItem = "0"; if (!CheckInfoUtil.checkNull(node.get("enableProcessItem"))) { enableProcessItem = node.get("enableProcessItem").textValue(); @@ -181,7 +184,7 @@ public class ViewModelController { String beId = node.get("beId").textValue(); String voGeneratingAssembly = node.get("voGeneratingAssembly").textValue(); - return convertBizEntityToViewModel(bizEntityJson, bePkgName, beId, voGeneratingAssembly, enableProcessItem); + return convertBizEntityToViewModel(bizEntityJson, bePkgName, beId, voGeneratingAssembly, enableProcessItem, relativePath); } catch (JsonProcessingException e) { throw new ViewModelException(VoWebApiErrorCodes.GSP_VIEWOBJECT_WEBAPI_1003, e); } @@ -629,11 +632,11 @@ public class ViewModelController { } private String convertBizEntityToViewModel(String bizEntityJson, String bePkgName, String beId, - String voGeneratingAssembly, String enableProcessItem) { - GspBusinessEntity be = null; + String voGeneratingAssembly, String enableProcessItem,String relativePath) { + GspBusinessEntity be; try { be = new ObjectMapper().readValue(bizEntityJson, GspBusinessEntity.class); - GspViewModel vm = ConvertUtils.convertToViewModel(be, bePkgName, beId, voGeneratingAssembly); + GspViewModel vm = ConvertUtils.convertToViewModel(be, bePkgName, beId, voGeneratingAssembly,relativePath); // 联动vo的关联带出字段枚举信息 LinkBeUtils linkBeUtils = new LinkBeUtils(); linkBeUtils.linkBeRefElements(vm);