From da1dc82febf5185d4cfc1ea0c6e4111a2227699e Mon Sep 17 00:00:00 2001 From: wangyandong01 Date: Sat, 22 Jun 2024 15:07:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 ++++- view-object-manager/pom.xml | 7 ++- .../MappedCdpActionComponentGenerator.java | 43 +++++++++++++++++-- .../JavaBaseCompCodeGenerator.java | 12 ------ .../JavaCodeFileGenerator.java | 2 + .../JavaMappedCdpActionGenerator.java | 6 --- view-object-model/pom.xml | 9 +++- view-object-rtwebapi/pom.xml | 2 +- view-object-webapi/pom.xml | 2 +- 9 files changed, 64 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 9f9c5a8..c6d7142 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ 0.1.40 0.1.36 0.1.15 + 0.1.2 @@ -63,8 +64,13 @@ com.inspur.edp - bef-bizentity - ${bef.designtime.version} + common-model + ${bef.entity.model.version} + + + com.inspur.edp + business-entity-model + ${bef.entity.model.version} com.inspur.edp diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index 0b1983b..631faa8 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -31,6 +31,11 @@ 0.1.2 + + com.inspur.edp + metadata-service-dev-api + 0.1.1-SNAPSHOT + com.inspur.edp view-object-model @@ -50,7 +55,7 @@ com.inspur.edp - das-commonmodel + common-model com.inspur.edp diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java index 0778066..9f7dcbd 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java @@ -17,8 +17,13 @@ import com.inspur.edp.formserver.viewmodel.util.ViewModelUtils; import com.inspur.edp.formserver.vmmanager.exception.VoManagerErrorCodes; import com.inspur.edp.formserver.vmmanager.generatacmpcode.JavaCompCodeNames; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspProject; +import com.inspur.edp.lcm.metadata.api.service.GspProjectService; import com.inspur.edp.lcm.metadata.api.service.MetadataService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.commons.utils.StringUtils; + +import java.io.IOException; public class MappedCdpActionComponentGenerator { /** @@ -39,6 +44,10 @@ public class MappedCdpActionComponentGenerator { * 原始构件 */ protected VMComponent originalComponent; + /** + * 包前缀 + */ + private String packagePrefix; public static MappedCdpActionComponentGenerator getInstance() { return new MappedCdpActionComponentGenerator(); @@ -61,6 +70,9 @@ public class MappedCdpActionComponentGenerator { this.assemblyName = assemblyName; namespace = defaltnamespace; this.bizObjectID = bizObjectID; + //获取包路径前缀，common-model发版之后调用MetadataProjectUtil.getPackagePrefix(path);即可 + this.packagePrefix = getPackagePrefix(path); + if (ViewModelUtils.checkNull(mappedCdpAction.getComponentEntityId())) { createComponent(mappedCdpAction, path); return mappedCdpAction.getCode(); @@ -70,6 +82,28 @@ public class MappedCdpActionComponentGenerator { return null; } + /** + * 根据工程路径，获取包路径前缀，默认为com + * @param relativePath + * @return + */ + private String getPackagePrefix(String relativePath) { + String packagePrefix = "com"; + if (StringUtils.isEmpty(relativePath)) { + return packagePrefix; + } + GspProjectService gspProjectService = SpringBeanUtils.getBean(GspProjectService.class); + try { + GspProject gspProject = gspProjectService.getGspProjectInfo(relativePath); + if (gspProject != null) { + packagePrefix = gspProject.getPackagePrefix(); + } + return packagePrefix; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + /** * 新建构件 * @@ -110,7 +144,8 @@ public class MappedCdpActionComponentGenerator { component.getVmMethod().setDotnetAssembly(this.assemblyName); String suffix = String.format("%1$s%2$s%3$s%4$s", '.', this.vmActionCode, '.', JavaCompCodeNames.VOActionNameSpaceSuffix); - String packageName = javaModuleImportPackage(namespace); + //添加前缀 + String packageName = javaModuleImportPackage(this.packagePrefix, namespace); packageName = String.format("%1$s%2$s", packageName, suffix.toLowerCase()); if (this.originalComponent != null) { @@ -131,13 +166,13 @@ public class MappedCdpActionComponentGenerator { connections = classNamestr.substring(classNamestr.lastIndexOf('.')); connections = String.format("%1$s%2$s", packageNameStr, connections); } - return (connections); } - protected final String javaModuleImportPackage(String packageName) { + protected final String javaModuleImportPackage(String packagePrefix, String packageName) { String[] strArray = packageName.split("[.]", -1); - String str = "com."; + //namespace前面添加包前缀 + String str = packagePrefix + "."; int i; for (i = 0; i < strArray.length - 1; i++) { diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseCompCodeGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseCompCodeGenerator.java index a317a95..49f48bb 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseCompCodeGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseCompCodeGenerator.java @@ -89,18 +89,6 @@ public abstract class JavaBaseCompCodeGenerator implements JavaIBaseCompCodeGen this.isInterpretation = SpringBeanUtils.getBean(MetadataProjectService.class).isInterpretation(path); } - private String convertJavaImportPackage(String readPropertyValue_string) { - String[] strArray = readPropertyValue_string.split("[.]", -1); - String str = "com."; - int i; - - for (i = 0; i < strArray.length - 1; i++) { - str += strArray[i].toLowerCase() + "."; - } - str += strArray[i].toLowerCase(); - return str; - } - protected abstract String getNameSpaceSuffix(); public String getCompName() { diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java index 0687882..170d937 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java @@ -43,6 +43,7 @@ public class JavaCodeFileGenerator { GspProject metadataProj = SpringBeanUtils.getBean(MetadataService.class) .getGspProjectInfo(relativePath); viewModel = (GspViewModel) metadata.getContent(); + //根据元数据相对路径获取工程的namespace（dotnet中对应程序集名称） compAssemblyName = metadataProj.getProjectNameSpace(); fsService = SpringBeanUtils.getBean(FileService.class); iFsService = SpringBeanUtils.getBean(IFsService.class); @@ -540,6 +541,7 @@ public class JavaCodeFileGenerator { private String prepareDir(ViewModelActionInfo actionInfo) { MetadataProjectService service = SpringBeanUtils.getBean(MetadataProjectService.class); + //获取ava工程路径下java文件夹路径 String compModulePath = service.getJavaCompProjectPath(relativePath); String className = VmManagerService.getComponentJavaClassName(actionInfo); //构件中获取javaClassName,需要截取掉一级ClassName拼接相对路径 diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java index 5d75224..dd3622e 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java @@ -36,12 +36,6 @@ public class JavaMappedCdpActionGenerator extends JavaBaseActionGenerator { return JavaCompCodeNames.VOActionNameSpaceSuffix; } - - ///#endregion - - - ///#region generateConstructor - @Override public void generateConstructor(StringBuilder result) { result.append(getIndentationStr()).append(JavaCompCodeNames.KeywordPublic).append(" ").append(getCompName()).append("("); diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index a04b902..59f9188 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -55,11 +55,11 @@ com.inspur.edp - bef-bizentity + business-entity-model com.inspur.edp - das-commonmodel + common-model io.iec.edp @@ -98,6 +98,11 @@ udt-designtime-api 0.1.7 + + com.inspur.edp + common-entity-model + 0.1.2 + com.inspur.edp bef-component diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml index 494be59..0c6e8b5 100644 --- a/view-object-rtwebapi/pom.xml +++ b/view-object-rtwebapi/pom.xml @@ -30,7 +30,7 @@ com.inspur.edp - bef-bizentity + business-entity-model com.inspur.edp diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index b59cac7..b3261bf 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -52,7 +52,7 @@ com.inspur.edp - bef-bizentity + business-entity-model com.inspur.edp -- Gitee From 4fe2fa8435bcf0bbf362daff217a429e446ab470 Mon Sep 17 00:00:00 2001 From: wangyandong01 Date: Wed, 3 Jul 2024 16:03:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8C=85=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++++ view-object-manager/pom.xml | 1 - .../vmmanager/createvmmetadata/GspMetadataExchangeUtil.java | 1 + .../createvmmetadata/MappedCdpActionComponentGenerator.java | 2 ++ .../extendinfo/repository/GspVoExtendInfoRepository.java | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c6d7142..aa887b0 100644 --- a/pom.xml +++ b/pom.xml @@ -127,6 +127,11 @@ metadata-deploy-api ${metadata.deploy.version} + + com.inspur.edp + metadata-service-dev-api + 0.1.1 + diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index 631faa8..bbf6473 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -34,7 +34,6 @@ com.inspur.edp metadata-service-dev-api - 0.1.1-SNAPSHOT com.inspur.edp diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java index f3d7674..dfb879b 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java @@ -166,6 +166,7 @@ public class GspMetadataExchangeUtil { GspMetadata tempVar = new GspMetadata(); tempVar.setHeader(new MetadataHeader()); tempVar.setRefs(new ArrayList()); + tempVar.setRelativePath(this.getMetadataPath()); GspMetadata metadata = tempVar; return metadata; } diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java index 9f7dcbd..5f98beb 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/MappedCdpActionComponentGenerator.java @@ -146,6 +146,8 @@ public class MappedCdpActionComponentGenerator { String suffix = String.format("%1$s%2$s%3$s%4$s", '.', this.vmActionCode, '.', JavaCompCodeNames.VOActionNameSpaceSuffix); //添加前缀 String packageName = javaModuleImportPackage(this.packagePrefix, namespace); + //assembly对应JavaPackageName + component.getMethod().setAssembly(packageName); packageName = String.format("%1$s%2$s", packageName, suffix.toLowerCase()); if (this.originalComponent != null) { diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java index 9f61be6..a38e9ba 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java @@ -8,7 +8,7 @@ import java.util.List; public interface GspVoExtendInfoRepository extends DataRepository { /** - * 根据configId获取某条BE扩展信息 + * 根据d获取某条BE扩展信息 * * @param configId * @return -- Gitee From 7c4b7eb245d6186704ed125e4a2829cdaaf748a9 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Fri, 19 Jul 2024 17:02:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=81=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GspMetadataExchangeUtil.java | 30 +++++++++---- .../repository/GspVoExtendInfoRepository.java | 22 ++++++++-- .../JavaBaseActionGenerator.java | 42 +++++-------------- .../JavaCodeFileGenerator.java | 33 +++++++++++++-- 4 files changed, 80 insertions(+), 47 deletions(-) diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java index dfb879b..0ad7570 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/GspMetadataExchangeUtil.java @@ -1,11 +1,25 @@ -package com.inspur.edp.formserver.vmmanager.createvmmetadata; +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.inspur.edp.formserver.vmmanager.createvmmetadata; import com.inspur.edp.bef.component.base.GspComponent; import com.inspur.edp.formserver.viewmodel.util.ViewModelUtils; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; -import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; import com.inspur.edp.lcm.metadata.api.service.MetadataService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; @@ -15,9 +29,9 @@ import java.util.ArrayList; * 与元数据交互的工具 */ public class GspMetadataExchangeUtil { - private final String VM_TYPE = "VMComponent"; - private final String VM_FILESUFFIX = ".vmCmp"; - private final String VOACTIONCONTROLLER = "VOActionController"; + private final static String VM_TYPE = "VMComponent"; + private final static String VM_FILESUFFIX = ".vmCmp"; + private final static String VOACTIONCONTROLLER = "VOActionController"; public static GspMetadataExchangeUtil getInstance() { return new GspMetadataExchangeUtil(); @@ -165,10 +179,9 @@ public class GspMetadataExchangeUtil { private GspMetadata createMetadataEntity() { GspMetadata tempVar = new GspMetadata(); tempVar.setHeader(new MetadataHeader()); - tempVar.setRefs(new ArrayList()); + tempVar.setRefs(new ArrayList<>()); tempVar.setRelativePath(this.getMetadataPath()); - GspMetadata metadata = tempVar; - return metadata; + return tempVar; } /** @@ -219,7 +232,6 @@ public class GspMetadataExchangeUtil { * 生成构件元数据 * * @param metadata 元数据 - * @param * @return 生成的构件元数据名称 * */ diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java index a38e9ba..0866f6b 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/repository/GspVoExtendInfoRepository.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.inspur.edp.formserver.vmmanager.extendinfo.repository; import com.inspur.edp.formserver.viewmodel.extendinfo.entity.GspVoExtendInfoEntity; @@ -8,10 +24,10 @@ import java.util.List; public interface GspVoExtendInfoRepository extends DataRepository { /** - * 根据d获取某条BE扩展信息 + * 根据configId获取某条BE扩展信息 * - * @param configId - * @return + * @param configId 业务标识id + * @return BE扩展信息 */ GspVoExtendInfoEntity getVoExtendInfoByConfigId(String configId); diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java index fe02aa7..53e1dde 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java @@ -29,15 +29,18 @@ import com.inspur.edp.formserver.viewmodel.exception.ViewModelException; import com.inspur.edp.formserver.viewmodel.util.ViewModelUtils; import com.inspur.edp.formserver.vmmanager.exception.VoManagerErrorCodes; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; import java.util.Map; public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator { ///#region 字段和属性 private MappedCdpAction vmAction; - private java.util.ArrayList usingList; - private java.util.LinkedHashMap parameters; - private java.util.ArrayList allGenericParamType; + private ArrayList usingList; + private LinkedHashMap parameters; + private ArrayList allGenericParamType; protected String ReturnTypeName = "VoidActionResult"; protected String errorCode = "VmBaseActionGenerator"; @@ -49,8 +52,8 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator if (this.vmAction == null) { throw new ViewModelException(VoManagerErrorCodes.GSP_VIEWOBJECT_MANAGER_0019, null); } - this.usingList = new java.util.ArrayList(); - this.allGenericParamType = new java.util.ArrayList(); + this.usingList = new ArrayList<>(); + this.allGenericParamType = new ArrayList<>(); ///#region ReturnValue @@ -66,7 +69,7 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator if (this.vmAction.getParameterCollection() == null || this.vmAction.getParameterCollection().getCount() < 1) { return; } - parameters = new java.util.LinkedHashMap(); + parameters = new LinkedHashMap<>(); for (Object actionParameter : this.vmAction.getParameterCollection()) { getParameterUsing((IViewModelParameter) actionParameter); @@ -283,8 +286,6 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator result.append(parameterValue.getParamType()).append(" ").append(parameterKey); if (i < parameters.size() - 1) { result.append(","); - } else { - result.append(""); } } } @@ -373,7 +374,7 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator if (Boolean.class == type) { return "Boolean"; } - if (java.util.Date.class == type) { + if (Date.class == type) { return "Date"; } if (java.math.BigDecimal.class == type) { @@ -395,29 +396,6 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator //TODO 后续确认 private String getGenericExpress(Class type) { -// if (!type.IsGenericType) -// { -// return getClassName(type); -// } -// else -// { -// Class[] array = type.GenericTypeArguments; -// int count = array.length; -// String info = "{0}"; -// for (int i = 1; i < count; i++) -// { -// info = info + "," + "{" + i + "}"; -// } -// info = getClassName(type) + "<" + info + ">"; -// String[] arrayStr = new String[count]; -// for (int i = 0; i < count; i++) -// { -// arrayStr[i] = getGenericExpress(array[i]); -// } -// info = String.format(info, arrayStr); -// -// return info; -// } return ""; } diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java index 28b3f75..2d033e5 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java @@ -22,7 +22,11 @@ import com.inspur.edp.cef.designtime.api.operation.CommonDetermination; import com.inspur.edp.cef.variable.dtgenerator.vardtmGenerate.javageneratecmpcode.JavaCommonDeterminationGenerator; import com.inspur.edp.cef.variable.dtgenerator.vardtmGenerate.javageneratecmpcode.JavaIBaseCompCodeGen; import com.inspur.edp.formserver.viewmodel.GspViewModel; -import com.inspur.edp.formserver.viewmodel.action.*; +import com.inspur.edp.formserver.viewmodel.action.ActionParamInfo; +import com.inspur.edp.formserver.viewmodel.action.MappedCdpAction; +import com.inspur.edp.formserver.viewmodel.action.ViewModelAction; +import com.inspur.edp.formserver.viewmodel.action.ViewModelActionInfo; +import com.inspur.edp.formserver.viewmodel.action.ViewModelActionType; import com.inspur.edp.formserver.viewmodel.common.InternalExtendActionUtil; import com.inspur.edp.formserver.viewmodel.common.ValueHelpConfig; import com.inspur.edp.formserver.viewmodel.common.ViewModelActionUtil; @@ -31,7 +35,30 @@ import com.inspur.edp.formserver.viewmodel.exception.ViewModelException; import com.inspur.edp.formserver.viewmodel.util.ViewModelUtils; import com.inspur.edp.formserver.vmmanager.createvmmetadata.ComponentGenUtil; import com.inspur.edp.formserver.vmmanager.exception.VoManagerErrorCodes; -import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.*; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAbstractDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAbstractModifyActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAbstractMultiDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAbstractRetrieveDefaultActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterModifyActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterMultiDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterQueryActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterRetrieveActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterRetrieveDefaultActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaAfterSaveActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeModifyActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeMultiDeleteActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeQueryActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeRetrieveActionsGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeRetrieveDefaultActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaBeforeSaveActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaChangeMappingActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaChangeReversalMappingActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaDataMappingActionsGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaDataReversalMappingActionsGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaQueryActionGenerator; +import com.inspur.edp.formserver.vmmanager.generatacmpcode.voextendedaction.JavaRetrieveActionGenerator; import com.inspur.edp.formserver.vmmanager.service.VmManagerService; import com.inspur.edp.lcm.fs.api.IFsService; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; @@ -541,7 +568,7 @@ public class JavaCodeFileGenerator { private String prepareDir(ViewModelActionInfo actionInfo) { MetadataProjectService service = SpringBeanUtils.getBean(MetadataProjectService.class); - //获取ava工程路径下java文件夹路径 + //获取Java工程路径下java文件夹路径 String compModulePath = service.getJavaCompProjectPath(relativePath); String className = VmManagerService.getComponentJavaClassName(actionInfo); //构件中获取javaClassName,需要截取掉一级ClassName拼接相对路径 -- Gitee