diff --git a/pom.xml b/pom.xml index 518b60515fb84baec180237600e34d752dea0dc1..87d3e085aa16f402ab1de0723b66b0baa757ccbd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot-parent - 0.3.6 + 1.5.0 4.0.0 @@ -29,7 +29,7 @@ com.inspur.edp viewObject-model1 pom - 0.1.2 + 0.1.4-SNAPSHOT view-object-model view-object-manager @@ -43,14 +43,12 @@ 0.2.26 0.1.18 0.2.17 + 0.1.5 0.1.5 - 0.1.40 - 0.1.40 0.1.36 0.1.15 - 1.0.0-rc.1 - 0.1.4 0.1.0 + 0.1.40 0.1.4 0.2.0 0.3.34 @@ -58,16 +56,37 @@ 0.1.3 0.1.0 0.1.7 - 0.3.4 - 0.1.5 + 0.1.6 0.1.0 0.1.1 0.1.0 0.1.0 - 0.1.40-SNAPSHOT + 0.1.0 + 0.1.9 + 0.3.5 + + com.inspur.edp + view-object-api + ${project.version} + + + com.inspur.edp + view-object-manager + ${project.version} + + + com.inspur.edp + view-object-model + ${project.version} + + + com.inspur.edp + view-object-voextendinfo-server-api + ${project.version} + com.inspur.edp business-entity-model @@ -87,6 +106,12 @@ com.inspur.edp common-model ${bef-entity-model.version} + + + com.inspur.edp + lcm-metadata-api + + com.inspur.edp @@ -109,19 +134,11 @@ ${caf.cef.schema.version} - com.inspur.edp metadata-deploy-api ${metadata.deploy.version} - - - - io.iec.edp - caf-caching - ${caf-caching.version} - com.inspur.edp common-entity-variable-generator @@ -137,11 +154,38 @@ bef-component ${bef-component.version} + + com.inspur.edp + common-component-api + + + com.inspur.edp + formserver-viewmodel + + + ${common-component.version} + + + com.inspur.edp + bff-engine-core + + + com.inspur.edp + formserver-viewmodel + + + ${bff-engine.version} + com.inspur.edp task-api ${task-api.version} + + com.inspur.edp + lcm-mimic-api + ${lcm-mimic-framework.version} + com.inspur.edp wf-runtime-api @@ -149,13 +193,13 @@ com.inspur.edp - metadata-businesstype-api - ${metadata-businesstype-api.version} + cef-designtime-core + ${cef.designtime.version} - io.iec.edp - caf-rpc-api - ${caf-rpc-api.version} + com.inspur.edp + metadata-businesstype-api + ${metadata-businesstype-api.version} com.inspur.edp @@ -204,8 +248,13 @@ com.inspur.edp - lcm-metadata-api - ${metadata-api.version} + web-help-metadata + ${web-help.version} + + + com.inspur.edp + wf-bizprocess-api + ${wf-bizprocess-server.version} diff --git a/view-object-api/pom.xml b/view-object-api/pom.xml index 2b77a5e5421bee4d38e7c95fdbf2e9ca517bd2fb..b61c8c4aa91a12b45a8e4f924b5c7ebc05653068 100644 --- a/view-object-api/pom.xml +++ b/view-object-api/pom.xml @@ -1,4 +1,20 @@ + + @@ -6,12 +22,10 @@ com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT - view-object-api - 0.1.2 diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index ac30806875e1150a25afa21ed72341aa09af7b39..38963d61a3b91d0f1a030217c8853a2115e7c9da 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -23,36 +23,24 @@ com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT - view-object-manager - 0.1.2 - com.inspur.edp view-object-model - compile - ${project.version} com.inspur.edp view-object-voextendinfo-server-api - compile - ${project.version} com.inspur.edp common-model - - com.inspur.edp - runtime-customize-api - 0.1.1-SNAPSHOT - com.inspur.edp caf-cef-rt-api @@ -98,7 +86,6 @@ com.inspur.edp lcm-logging-service - 0.1.4 com.inspur.edp @@ -106,18 +93,11 @@ io.iec.edp - caf-boot-commons-json + caf-commons-serialization-json com.inspur.edp common-component-api - - - com.inspur.edp - formserver-viewmodel - - - 0.1.40 com.inspur.edp @@ -126,7 +106,6 @@ io.iec.edp caf-rpc-api - com.inspur.edp @@ -147,13 +126,6 @@ com.inspur.edp bff-engine-core - - - com.inspur.edp - formserver-viewmodel - - - 0.1.5 com.inspur.edp @@ -166,20 +138,10 @@ com.inspur.edp cef-designtime-core - ${cef.designtime.version} - - - 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-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java index 3a9662769081539d31032121afcbc623ea4cdc3d..8318bdf37c6ec8ac8f3865bb192853bb018b4bc8 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java @@ -16,7 +16,6 @@ package com.inspur.edp.formserver.vmmanager.accessory; -import com.inspur.common.component.api.service.workflow.ApprovalCommentsPropMapping; import com.inspur.edp.bef.component.detailcmpentity.vm.VMComponent; import com.inspur.edp.bef.component.detailcmpentity.vm.VMMethodParameter; import com.inspur.edp.cef.designtime.api.element.GspAssociationKey; @@ -45,8 +44,13 @@ import com.inspur.edp.task.service.TaskCommentService; import io.iec.edp.caf.common.JSONSerializer; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.rpc.client.RpcClassHolder; +import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.UUID; public class AccessoryServiceImpl implements AccessoryService { @@ -389,8 +393,9 @@ public class AccessoryServiceImpl implements AccessoryService { childObj.setParent(parentObj); TaskCommentService service = SpringBeanUtils.getBean(RpcClassHolder.class).getRpcClass(TaskCommentService.class); List commentFieldInfos = service.getTaskCommentFields(); - if (commentFieldInfos == null || commentFieldInfos.size() < 0) + if (commentFieldInfos == null) { throw new ViewModelException(VoManagerErrorCodes.GSP_VIEWOBJECT_MANAGER_0004, null); + } addIdAndparentId(childObj, parentObj); for (CommentFieldInfo commentFieldInfo : commentFieldInfos) { if (COL_ID.equals(commentFieldInfo.getVoCode())) @@ -417,13 +422,12 @@ public class AccessoryServiceImpl implements AccessoryService { } private boolean dealLength(CommentFieldInfo info) { - if (info.getLength() > 0) - return true; - else - return false; + return info.getLength() > 0; } - private void addAfterRetrieveAction(GspViewModel model, GspViewObject childObj, String approvalCommentLabel, String componentID, String approvalLabelId, String approvalChildCode, boolean includeBacklogs) { + private void addAfterRetrieveAction(GspViewModel model, GspViewObject childObj, String approvalCommentLabel, + String componentID, String approvalLabelId, String approvalChildCode, + boolean includeBacklogs) { MappedCdpAction action = new MappedCdpAction(); action.setID(Guid.newGuid().toString()); String code = "InitApprovalComments"; @@ -449,57 +453,63 @@ public class AccessoryServiceImpl implements AccessoryService { VMMethodParameter getPayLoadPar = null; for (VMMethodParameter param : retrieveComponent.getVmMethod().getParams()) { - if (param.getParamCode().equalsIgnoreCase(approvalChildCode)) { + if (StringUtils.equalsIgnoreCase(param.getParamCode(), approvalChildCode)) { childCodePar = param; - } else if (param.getParamCode().equalsIgnoreCase(approvalLabelId)) { + } else if (StringUtils.equalsIgnoreCase(param.getParamCode(), approvalLabelId)) { approvalLabelIdPar = param; - } else if (param.getParamCode().equalsIgnoreCase(RETRIEVE_ACTION_APPROVALGETLOGS_PAYLOAD)) { + } else if (StringUtils.equalsIgnoreCase(param.getParamCode(), RETRIEVE_ACTION_APPROVALGETLOGS_PAYLOAD)) { getPayLoadPar = param; } } - MappedCdpActionParameter parChildCode = new MappedCdpActionParameter(); - parChildCode.setID(childCodePar.getID()); - parChildCode.setParamName(childCodePar.getParamName()); - parChildCode.setParamCode(childCodePar.getParamCode()); - parChildCode.setParameterType(VMParameterType.String); - parChildCode.setCollectionParameterType(VMCollectionParameterType.List); - List codes = new ArrayList<>(); - IGspCommonObject currentObj = childObj; - while (currentObj.getParentObject() != null) { - codes.add(currentObj.getCode()); - currentObj = currentObj.getParentObject(); + if (childCodePar != null) { + MappedCdpActionParameter parChildCode = new MappedCdpActionParameter(); + parChildCode.setID(childCodePar.getID()); + parChildCode.setParamName(childCodePar.getParamName()); + parChildCode.setParamCode(childCodePar.getParamCode()); + parChildCode.setParameterType(VMParameterType.String); + parChildCode.setCollectionParameterType(VMCollectionParameterType.List); + List codes = new ArrayList<>(); + IGspCommonObject currentObj = childObj; + while (currentObj.getParentObject() != null) { + codes.add(currentObj.getCode()); + currentObj = currentObj.getParentObject(); + } + Collections.reverse(codes); + parChildCode.getActualValue().setHasValue(true); + parChildCode.getActualValue().setEnable(true); + parChildCode.getActualValue().setValue(JSONSerializer.serialize(codes)); + action.getParameterCollection().add(parChildCode); + } + + if (approvalLabelIdPar != null) { + MappedCdpActionParameter parProcessInstLabelId = new MappedCdpActionParameter(); + parProcessInstLabelId.setID(approvalLabelIdPar.getID()); + parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamName()); + parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamCode()); + parProcessInstLabelId.setParameterType(VMParameterType.String); + parProcessInstLabelId.getActualValue().setHasValue(true); + parProcessInstLabelId.getActualValue().setEnable(true); + parProcessInstLabelId.getActualValue().setValue(approvalCommentLabel); + action.getParameterCollection().add(parProcessInstLabelId); + } + + if (getPayLoadPar != null) { + MappedCdpActionParameter parPropertyMapping = new MappedCdpActionParameter(); + parPropertyMapping.setID(getPayLoadPar.getID()); + parPropertyMapping.setParamCode(getPayLoadPar.getParamName()); + parPropertyMapping.setParamCode(getPayLoadPar.getParamCode()); + parPropertyMapping.setParameterType(VMParameterType.Custom); + parPropertyMapping.setAssembly("com.inspur.edp.task.payload"); + parPropertyMapping.setClassName( + "com.inspur.edp.task.payload.GetTaskLogsPayload"); + parPropertyMapping.getActualValue().setHasValue(true); + parPropertyMapping.getActualValue().setEnable(true); + GetTaskLogsPayload taskLogsPayload = new GetTaskLogsPayload(); + taskLogsPayload.setIsIncludeBackLogs(includeBacklogs); + taskLogsPayload.setIsIncludeSignImageBase64(true); + parPropertyMapping.getActualValue().setValue(JSONSerializer.serialize(taskLogsPayload)); + action.getParameterCollection().add(parPropertyMapping); } - Collections.reverse(codes); - parChildCode.getActualValue().setHasValue(true); - parChildCode.getActualValue().setEnable(true); - parChildCode.getActualValue().setValue(JSONSerializer.serialize(codes)); - action.getParameterCollection().add(parChildCode); - - MappedCdpActionParameter parProcessInstLabelId = new MappedCdpActionParameter(); - parProcessInstLabelId.setID(approvalLabelIdPar.getID()); - parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamName()); - parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamCode()); - parProcessInstLabelId.setParameterType(VMParameterType.String); - parProcessInstLabelId.getActualValue().setHasValue(true); - parProcessInstLabelId.getActualValue().setEnable(true); - parProcessInstLabelId.getActualValue().setValue(approvalCommentLabel); - action.getParameterCollection().add(parProcessInstLabelId); - - MappedCdpActionParameter parPropertyMapping = new MappedCdpActionParameter(); - parPropertyMapping.setID(getPayLoadPar.getID()); - parPropertyMapping.setParamCode(getPayLoadPar.getParamName()); - parPropertyMapping.setParamCode(getPayLoadPar.getParamCode()); - parPropertyMapping.setParameterType(VMParameterType.Custom); - parPropertyMapping.setAssembly("com.inspur.edp.task.payload"); - parPropertyMapping.setClassName( - "com.inspur.edp.task.payload.GetTaskLogsPayload"); - parPropertyMapping.getActualValue().setHasValue(true); - parPropertyMapping.getActualValue().setEnable(true); - GetTaskLogsPayload taskLogsPayload = new GetTaskLogsPayload(); - taskLogsPayload.setIsIncludeBackLogs(includeBacklogs); - taskLogsPayload.setIsIncludeSignImageBase64(true); - parPropertyMapping.getActualValue().setValue(JSONSerializer.serialize(taskLogsPayload)); - action.getParameterCollection().add(parPropertyMapping); model.getDataExtendInfo().getAfterRetrieveActions().add(action); } @@ -521,99 +531,4 @@ public class AccessoryServiceImpl implements AccessoryService { info.getVoCode(), info.getName(), info.getFieldType().toString()); } } - - private void addDataExtendInfo(GspViewModel model, GspViewObject childObj, - String processInstLabelId, String componentID, String childNodeCode, String approvalFieldLabelID, boolean includeBacklogs) { - MappedCdpAction action = new MappedCdpAction(); - action.setID(Guid.newGuid().toString()); - String code = "InitApprovalComments"; - while (true) { - final String tempCode = code; - if (model.getDataExtendInfo().getAfterRetrieveActions().stream() - .anyMatch(item -> item.getCode().equalsIgnoreCase(tempCode))) { - code = "InitApprovalComments" + Guid.newGuid().toString().substring(0, 7); - continue; - } - break; - } - action.setCode(code); - action.setType(ViewModelActionType.VMAction); - action.setName(code); - action.setComponentEntityId(componentID); - - GspMetadata retrieveActionMetadata = MetadataUtil.getCustomMetadata(componentID); - VMComponent retrieveComponent = (VMComponent) retrieveActionMetadata.getContent(); - - VMMethodParameter childCodePar = null; - VMMethodParameter processInstLabelIdPar = null; - VMMethodParameter propertyMappingPar = null; - - for (VMMethodParameter param : retrieveComponent.getVmMethod().getParams()) { - if (param.getParamCode().equalsIgnoreCase(childNodeCode)) { - childCodePar = param; - } else if (param.getParamCode().equalsIgnoreCase(approvalFieldLabelID)) { - processInstLabelIdPar = param; - } else if (param.getParamCode().equalsIgnoreCase(RETRIEVE_ACTION_PAR_PROPERTY_MAPPING)) { - propertyMappingPar = param; - } - } - MappedCdpActionParameter parChildCode = new MappedCdpActionParameter(); - parChildCode.setID(childCodePar.getID()); - parChildCode.setParamName(childCodePar.getParamName()); - parChildCode.setParamCode(childCodePar.getParamCode()); - parChildCode.setParameterType(VMParameterType.String); - parChildCode.setCollectionParameterType(VMCollectionParameterType.List); - ArrayList codes = new ArrayList<>(); - IGspCommonObject currentObj = childObj; - while (currentObj.getParentObject() != null) { - codes.add(currentObj.getCode()); - currentObj = currentObj.getParentObject(); - } - Collections.reverse(codes); - parChildCode.getActualValue().setHasValue(true); - parChildCode.getActualValue().setEnable(true); - parChildCode.getActualValue().setValue(JSONSerializer.serialize(codes)); - action.getParameterCollection().add(parChildCode); - - MappedCdpActionParameter parProcessInstLabelId = new MappedCdpActionParameter(); - parProcessInstLabelId.setID(processInstLabelIdPar.getID()); - parProcessInstLabelId.setParamCode(processInstLabelIdPar.getParamName()); - parProcessInstLabelId.setParamCode(processInstLabelIdPar.getParamCode()); - parProcessInstLabelId.setParameterType(VMParameterType.String); - parProcessInstLabelId.getActualValue().setHasValue(true); - parProcessInstLabelId.getActualValue().setEnable(true); - parProcessInstLabelId.getActualValue().setValue(processInstLabelId); - action.getParameterCollection().add(parProcessInstLabelId); - - MappedCdpActionParameter parPropertyMapping = new MappedCdpActionParameter(); - parPropertyMapping.setID(propertyMappingPar.getID()); - parPropertyMapping.setParamCode(propertyMappingPar.getParamName()); - parPropertyMapping.setParamCode(propertyMappingPar.getParamCode()); - parPropertyMapping.setParameterType(VMParameterType.Custom); - parPropertyMapping.setAssembly("com.inspur.edp.common.component.api"); - parPropertyMapping.setClassName( - "com.inspur.common.component.api.service.workflow.ApprovalCommentsPropMapping"); - parPropertyMapping.getActualValue().setHasValue(true); - parPropertyMapping.getActualValue().setEnable(true); - ApprovalCommentsPropMapping mapping = new ApprovalCommentsPropMapping(); - mapping.setProcessInstanceId(COL_ProcessInstanceId); - mapping.setRootProcessInstanceId(COL_RootProcessInstanceId); - mapping.setActivityInstanceId(COL_ActivityInstanceId); - mapping.setActivityName(COL_ActivityName); - mapping.setWorkItemId(COL_WorkItemId); - mapping.setOperatorId(COL_OperatorId); - mapping.setOperatorName(COL_OperatorName); - mapping.setType(COL_Type); - mapping.setActionCode(COL_ActionCode); - mapping.setActionName(COL_ActionName); - mapping.setMessage(COL_Message); - mapping.setTime(COL_Time); - mapping.setAttachment(COL_Attachment); - mapping.setSignatureImage(COL_SignatureImage); - mapping.setIncludeBackLogs(includeBacklogs); - parPropertyMapping.getActualValue().setValue(JSONSerializer.serialize(mapping)); - action.getParameterCollection().add(parPropertyMapping); - - model.getDataExtendInfo().getAfterRetrieveActions().add(action); - } } diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/ComponentGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/ComponentGenerator.java index 689e2207416f5cc307fa4b76e67235f2b74d2593..efc8a5ea4cb0d85c25f0e3f3c0d17b3b7a0d10d0 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/ComponentGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/createvmmetadata/ComponentGenerator.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.createvmmetadata; @@ -15,6 +31,9 @@ import com.inspur.edp.formserver.viewmodel.dataextendinfo.VoDataExtendInfo; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; import com.inspur.edp.lcm.metadata.api.service.MetadataProjectService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.commons.utils.StringUtils; + +import java.util.ArrayList; public class ComponentGenerator { public static final String ComponentDir = "component"; @@ -24,10 +43,10 @@ public class ComponentGenerator { } private ComponentGenerator() { - createComponentActionList = new java.util.ArrayList(); + createComponentActionList = new ArrayList(); } - private java.util.ArrayList createComponentActionList; + private ArrayList createComponentActionList; /** * VM的编号 */ @@ -90,7 +109,7 @@ public class ComponentGenerator { privateBizObjectID = value; } - public final java.util.ArrayList GenerateComponent(GspViewModel viewModel, String path, String bizObjectID) { + public final ArrayList GenerateComponent(GspViewModel viewModel, String path, String bizObjectID) { // 参数校验 DataValidator.checkForNullReference(viewModel, "viewModel"); DataValidator.checkForEmptyString(path, "path"); @@ -151,14 +170,14 @@ public class ComponentGenerator { private void generateViewModelActionComponents(GspViewModel viewModel, String path) { //视图操作构件元数据 for (ViewModelAction action : viewModel.getActions()) { - if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null)).getIsGenerateComponent()) { - setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().generateVMComponent((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null), path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); + if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction)action).getIsGenerateComponent()) { + setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().generateVMComponent((MappedCdpAction) action, path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); } } - java.util.ArrayList list = new java.util.ArrayList(); + ArrayList list = new ArrayList<>(); VoDataExtendInfo extendInfo = viewModel.getDataExtendInfo(); list.add(extendInfo.getAfterCreateActions()); list.add(extendInfo.getAfterModifyActions()); @@ -190,10 +209,10 @@ public class ComponentGenerator { for (VMActionCollection item : list) { for (ViewModelAction action : item) { - if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null)).getIsGenerateComponent()) { - if (InterActionCheck(action) == false) { + if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction)action).getIsGenerateComponent()) { + if (!InterActionCheck(action)) { //MappedCdpActionComponentGenerator.Instance.GenerateComponent(action as MappedCdpAction, path, this.VMActionCode, this.AssemblyName, this.BizObjectID); - setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().GenerateComponent((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null), path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); + setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().GenerateComponent((MappedCdpAction)action , path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); } } @@ -204,8 +223,8 @@ public class ComponentGenerator { if (valueHelpConfig.getHelpExtend() != null && valueHelpConfig.getHelpExtend().getBeforeHelp() != null) { for (ViewModelAction action : valueHelpConfig.getHelpExtend().getBeforeHelp()) { - if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null)).getIsGenerateComponent()) { - setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().GenerateComponent((MappedCdpAction) ((action instanceof MappedCdpAction) ? action : null), path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); + if (action.getType() == ViewModelActionType.VMAction && ((MappedCdpAction)action).getIsGenerateComponent()) { + setNewCompActionCode(MappedCdpActionComponentGenerator.getInstance().GenerateComponent((MappedCdpAction)action, path, this.getVMActionCode(), this.getAssemblyName(), getNamespace(), this.getBizObjectID())); } } } @@ -255,9 +274,8 @@ public class ComponentGenerator { } private void setNewCompActionCode(String code) { - if (code == null || code.equals("")) { - return; + if (!StringUtils.isEmpty(code)) { + this.createComponentActionList.add(code); } - this.createComponentActionList.add(code); } } \ No newline at end of file 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 53e1dde2647936cbce63bcf04ec9bc71aa017252..a8503f620ac02e282e6e845d6719e59948c579b6 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 @@ -32,6 +32,7 @@ import com.inspur.edp.formserver.vmmanager.exception.VoManagerErrorCodes; import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; +import java.util.Locale; import java.util.Map; public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator { @@ -415,7 +416,7 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator String result = ""; String[] list = source.split("[.]", -1); for (int i = 0; i < list.length; i++) { - String lowerCase = list[i].toLowerCase(); + String lowerCase = list[i].toLowerCase(Locale.ROOT); if (i == 0 && lowerCase.equals("inspur")) { result = String.format("%1$s%2$s", result, "com.inspur"); continue; diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index e93c87d78d87e1cbf16171a536470fbd89b97466..a03d8d8f9d94fd8c51a2d51a86768b7aacfb7434 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -23,22 +23,15 @@ com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT view-object-model - 0.1.2 io.iec.edp caf-commons-exception - 1.4.0 - - - io.iec.edp - caf-rpc-api - 0.3.4 com.inspur.edp @@ -51,11 +44,6 @@ com.fasterxml.jackson.core jackson-databind - compile - - - com.inspur.edp - business-entity-model com.inspur.edp @@ -63,36 +51,15 @@ io.iec.edp - caf-boot-commons-event + caf-event com.inspur.edp business-entity-model - - com.inspur.edp - 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 - io.iec.edp caf-rpc-api - 0.3.4 com.inspur.edp @@ -121,19 +88,14 @@ com.inspur.edp common-entity-model - 0.1.2 com.inspur.edp bef-component - 0.2.0 - compile io.iec.edp caf-i18n-api - 1.0.0-rc.1 - compile diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/collection/ViewObjectCollection.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/collection/ViewObjectCollection.java index 2aeecb1b3016ae72aecda998c75a7fd7afc0c0e9..63d42b6d62fef0d21fcc37c4fcd87205f12f3716 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/collection/ViewObjectCollection.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/collection/ViewObjectCollection.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.viewmodel.collection; import com.inspur.edp.das.commonmodel.IGspCommonObject; @@ -104,14 +120,15 @@ public class ViewObjectCollection extends GspObjectCollection implements Seriali * * @return VO节点元素集合 */ -// public final Object clone() public final ViewObjectCollection clone() { -// ViewObjectCollection collections = new ViewObjectCollection(ParentObject); ViewObjectCollection collections = new ViewObjectCollection(getParentObject()); -// for (var node : this) for (IGspCommonObject node : this) { - Object tempVar = ((GspViewObject) ((node instanceof GspViewObject) ? node : null)).clone(); - collections.add((GspViewObject) ((tempVar instanceof GspViewObject) ? tempVar : null)); + if (node instanceof GspViewObject) { + GspViewObject clone = ((GspViewObject) node).clone(); + collections.add(clone); + } else { + collections.add(null); + } } return collections; 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 e509a3103254d46bf5d7a6d7f95af759f5ff94e9..015e938fddcc19b567cbc4bc82cf59e81a6a0826 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 @@ -56,7 +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 io.iec.edp.caf.commons.utils.CollectionUtils; import lombok.var; import java.util.ArrayList; @@ -360,18 +360,25 @@ public final class ConvertUtils { * @param viewElements * @param elementMappings */ - public static void updateContainConstraints(IGspCommonObject beObject, GspViewObject viewObj, java.util.HashMap elementMappings, Map viewElements) { + public static void updateContainConstraints(IGspCommonObject beObject, GspViewObject viewObj, + Map elementMappings, + Map viewElements) { + if (CollectionUtils.isEmpty(beObject.getContainConstraints())) { + return; + } - GspUniqueConstraintCollection voUniqueCons = viewObj.getContainConstraints().clone(); - if (viewObj.getContainConstraints() != null && viewObj.getContainConstraints().size() > 0) { + GspUniqueConstraintCollection voUniqueCons = null; + if (viewObj.getContainConstraints() != null) { + voUniqueCons = viewObj.getContainConstraints().clone(); viewObj.getContainConstraints().clear(); } - if (beObject.getContainConstraints() == null || beObject.getContainConstraints().size() == 0) { - return; - } + for (GspUniqueConstraint beConstraint : beObject.getContainConstraints()) { - Object tempVar = beConstraint.clone(); - GspUniqueConstraint viewModelConstraint = (GspUniqueConstraint) ((tempVar instanceof GspUniqueConstraint) ? tempVar : null); + GspUniqueConstraint viewModelConstraint = beConstraint.clone(); + // clone 不应异常, 冗余处理 + if (viewModelConstraint == null) { + continue; + } viewModelConstraint.getElementList().clear(); for (String element : beConstraint.getElementList()) { if (!elementMappings.containsKey(element)) { @@ -389,7 +396,7 @@ public final class ConvertUtils { if (viewObj.getContainConstraints() == null) { viewObj.setContainConstraints(new GspUniqueConstraintCollection()); } - if (voUniqueCons != null && voUniqueCons.size() > 0) { + if (voUniqueCons != null) { for (GspUniqueConstraint voCon : voUniqueCons) { if (voCon.getCode().equals(viewModelConstraint.getCode())) { viewModelConstraint.setI18nResourceInfoPrefix(voCon.getI18nResourceInfoPrefix()); @@ -426,8 +433,8 @@ public final class ConvertUtils { for (IGspCommonField item : elementList) { GspViewModelElement viewModelElement = (GspViewModelElement) item; if (viewModelElement != null && viewModelElement.getMapping() != null) { - String key = ((GspViewModelElement) ((item instanceof GspViewModelElement) ? item : null)).getMapping().getTargetObjId(); - String value = item.getID(); + String key = viewModelElement.getMapping().getTargetObjId(); + String value = viewModelElement.getID(); elementMappings.put(key, value); } } @@ -717,15 +724,21 @@ public final class ConvertUtils { } vmEle.setChildAssociations(new GspAssociationCollection()); for (GspAssociation cmAssociation : cmEle.getChildAssociations()) { - GspAssociation vmAssociation = getAssociation((GspAssociation) cmAssociation, pkgName, metadataId, vmEle.getID(), sourceType); + GspAssociation vmAssociation = getAssociation(cmAssociation, pkgName, metadataId, vmEle.getID(), sourceType); + if (vmAssociation == null) { + continue; + } vmAssociation.setBelongElement(vmEle); vmEle.getChildAssociations().add(vmAssociation); } } private static GspAssociation getAssociation(GspAssociation cmAssociation, String pkgName, String metadataId, String vmElementId, GspVoElementSourceType souceType) { - Object tempVar = cmAssociation.clone(); - GspAssociation vmAssociation = (GspAssociation) ((tempVar instanceof GspAssociation) ? tempVar : null); + GspAssociation vmAssociation = cmAssociation.clone(); + + if (vmAssociation == null) { + return null; + } vmAssociation.getKeyCollection().clear(); for (GspAssociationKey associationKey : cmAssociation.getKeyCollection()) { @@ -748,10 +761,7 @@ 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; 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 c0bbbfd3b33b34f5ebf9f454243b7cda45aca81a..c257a770dd968bb1eecfad2a4b607830963bb68c 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 @@ -56,7 +56,9 @@ import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; import com.inspur.edp.lcm.metadata.api.entity.uri.MetadataURI; import com.inspur.edp.lcm.metadata.api.service.RefCommonService; import com.inspur.edp.metadata.rtcustomization.api.CustomizationService; +import io.iec.edp.caf.commons.utils.CollectionUtils; import io.iec.edp.caf.commons.utils.SpringBeanUtils; + import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -230,12 +232,12 @@ public class LinkBeUtils { if (childObj.getIsVirtual()) { continue; } - GspBizEntityObject childBizObject = getBizObject(((GspViewObject) childObj).getMapping(), childObj.getCode()); + GspBizEntityObject childBizObject = getBizObject(childObj.getMapping(), childObj.getCode()); if (childBizObject == null) { iterators.remove(); continue; } - linkBizObject((GspViewObject) ((GspViewObject) childObj != null ? childObj : null), childBizObject); + linkBizObject(childObj, childBizObject); } } } @@ -256,12 +258,12 @@ public class LinkBeUtils { if (childObj.getIsVirtual()) { continue; } - GspBizEntityObject childBizObject = getBizObject(viewModel, childObj, ((GspViewObject) childObj).getMapping(), childObj.getCode()); + GspBizEntityObject childBizObject = getBizObject(viewModel, childObj, childObj.getMapping(), childObj.getCode()); if (childBizObject == null) { iterators.remove(); continue; } - linkBizObject(viewModel, (GspViewObject) ((GspViewObject) childObj != null ? childObj : null), childBizObject); + linkBizObject(viewModel, childObj, childBizObject); } } } @@ -275,9 +277,9 @@ public class LinkBeUtils { public void linkObjectSelfInfo(GspViewObject viewObj, GspBizEntityObject bizObject, String parentObjectElementId) { ArrayList elementList = viewObj.getContainElements().getAllItems(item -> item.getIsVirtual() == false); - HashMap viewElements = new HashMap(); + HashMap viewElements = new HashMap<>(); for (IGspCommonField item : elementList) { - viewElements.put(item.getID(), (GspViewModelElement) item); + viewElements.put(item.getID(), item); } // 字段mapping字典 java.util.HashMap elementMappings = ConvertUtils.getElementMappingsDic(elementList); @@ -299,10 +301,10 @@ public class LinkBeUtils { //#region 字段 public void linkElements(GspViewObject viewObj) { - ArrayList elementList = viewObj.getContainElements().getAllItems(item -> item.getIsVirtual() == false); + ArrayList elementList = viewObj.getContainElements().getAllItems(item -> !item.getIsVirtual()); // 字段mapping字典 - if (elementList.size() == 0) { + if (CollectionUtils.isEmpty(elementList)) { throw new ViewModelException(VoModelErrorCodes.GSP_VIEWOBJECT_MODEL_1018, null, viewObj.getName()); } for (IGspCommonField ele : elementList) { @@ -329,7 +331,7 @@ public class LinkBeUtils { ArrayList elementList = viewObj.getContainElements().getAllItems(item -> item.getIsVirtual() == false); // 字段mapping字典 - if (elementList.size() == 0) { + if (CollectionUtils.isEmpty(elementList)) { throw new ViewModelException(VoModelErrorCodes.GSP_VIEWOBJECT_MODEL_1018, null, viewModel.getCode(), viewModel.getName(), viewObj.getCode(), viewObj.getName()); } @@ -464,14 +466,12 @@ public class LinkBeUtils { } public void linkElementEnums(GspViewModelElement ele, GspViewModelElement transElement) { - Object tempVar = ele.getContainEnumValues().clone(); - GspEnumValueCollection voEnumValues = (GspEnumValueCollection) ((GspEnumValueCollection) tempVar != null ? tempVar : null); + GspEnumValueCollection voEnumValues = ele.getContainEnumValues().clone(); ele.getContainEnumValues().clear(); for (GspEnumValue enumItem : transElement.getContainEnumValues()) { - Object tempVar2 = enumItem.clone(); - GspEnumValue enumValue = (GspEnumValue) ((GspEnumValue) tempVar2 != null ? tempVar2 : null); - if (voEnumValues != null && voEnumValues.size() > 0) { + GspEnumValue enumValue = enumItem.clone(); + if (!CollectionUtils.isEmpty(voEnumValues)) { for (GspEnumValue voEnumValue : voEnumValues) { if (voEnumValue.getValue().equals(enumValue.getValue())) { enumValue.setI18nResourceInfoPrefix(voEnumValue.getI18nResourceInfoPrefix()); diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoElementUtil.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoElementUtil.java index 717129f2c5af3ada170a0ea232979fd094ba72f9..68662c62c09f7d4c8352194e46b10c770524e698 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoElementUtil.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoElementUtil.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.viewmodel.util; @@ -7,6 +23,7 @@ import com.inspur.edp.cef.designtime.api.collection.GspFieldCollection; import com.inspur.edp.cef.designtime.api.element.GspAssociation; import com.inspur.edp.cef.designtime.api.element.GspAssociationKey; import com.inspur.edp.cef.designtime.api.element.GspElementDataType; +import com.inspur.edp.cef.designtime.api.element.GspElementObjectType; import com.inspur.edp.cef.designtime.api.element.GspEnumValue; import com.inspur.edp.das.commonmodel.IGspCommonElement; import com.inspur.edp.das.commonmodel.entity.element.GspCommonAssociation; @@ -22,8 +39,7 @@ import com.inspur.edp.udt.designtime.api.entity.dbInfo.ColumnInfo; import com.inspur.edp.udt.designtime.api.entity.dbInfo.ColumnMapType; import com.inspur.edp.udt.designtime.api.entity.element.UdtElement; import com.inspur.edp.udt.designtime.api.entity.enumtype.UseType; - -import java.util.UUID; +import io.iec.edp.caf.commons.utils.CollectionUtils; /** * 更新udt字段 @@ -31,17 +47,6 @@ import java.util.UUID; public class UpdateVoElementUtil { private boolean isVirtual = true; - /** - * 创建字段实例 - * - * @return - */ - private GspViewModelElement getChildElement() { - GspViewModelElement tempVar = new GspViewModelElement(); - tempVar.setID(UUID.randomUUID().toString()); - return tempVar; - } - /** * 根据引用的udt元数据更新字段(模板约束均更新) * @@ -52,7 +57,6 @@ public class UpdateVoElementUtil { element.setUdtID(udt.getId()); element.setUdtName(udt.getName()); - // 其他属性 if (udt instanceof ComplexDataTypeDef) { UpdateComplexDataTypeDefProperties(element, (ComplexDataTypeDef) udt); @@ -67,7 +71,6 @@ public class UpdateVoElementUtil { * @param info * @param prefix * @param ele 映射字段 - * @return */ public final void MapColumnInfoToField(ColumnInfo info, String prefix, GspViewModelElement ele) { if (ViewModelUtils.checkNull(prefix)) { @@ -108,7 +111,6 @@ public class UpdateVoElementUtil { } if (isFirstChoose || IsConstraint(sUdt, "Precision")) { element.setPrecision(sUdt.getPrecision()); - ; } if (isFirstChoose || IsConstraint(sUdt, "ObjectType")) { element.setObjectType(sUdt.getObjectType()); @@ -117,17 +119,17 @@ public class UpdateVoElementUtil { element.setChildAssociations(new GspAssociationCollection()); } - IGspCommonField belongElement = (element.getChildAssociations() != null && element.getChildAssociations().size() > 0) ? element.getChildAssociations().get(0).getBelongElement() : null; + IGspCommonField belongElement = (!element.getChildAssociations().isEmpty()) ? + element.getChildAssociations().get(0).getBelongElement() : null; GspAssociationCollection assos = element.getChildAssociations().clone(belongElement); element.getChildAssociations().clear(); - if (sUdt.getChildAssociations() != null && sUdt.getChildAssociations().size() > 0) { + if (!CollectionUtils.isEmpty(sUdt.getChildAssociations())) { for (GspAssociation item : sUdt.getChildAssociations()) { - - - GspAssociation beAsso = assos.stream().filter(asso -> asso.getId().equals(item.getId())).findFirst().orElse(null); - + GspAssociation beAsso = assos.stream() + .filter(asso -> asso.getId().equals(item.getId())) + .findFirst().orElse(null); element.getChildAssociations().add(ConvertUdtAssociation(item, element, beAsso, isFirstChoose)); } } @@ -135,27 +137,22 @@ public class UpdateVoElementUtil { element.setEnumIndexType(sUdt.getEnumIndexType()); // 枚举 element.getContainEnumValues().clear(); - if (sUdt.getContainEnumValues() != null && sUdt.getContainEnumValues().size() > 0) { + if (!CollectionUtils.isEmpty(sUdt.getContainEnumValues())) { for (GspEnumValue item : sUdt.getContainEnumValues()) { element.getContainEnumValues().add(item); } } } if (isFirstChoose || IsConstraint(sUdt, "DefaultValue")) { - element.setDefaultValue(sUdt.getDefaultValue() == null ? null : sUdt.getDefaultValue().toString()); } if (isFirstChoose || IsConstraint(sUdt, "IsRequired")) { element.setIsRef(sUdt.getIsRequired()); } - // UnifiedDataType属性，前端根据[约束]/[模板]控制属性是否可编辑 - //element.UnifiedDataType = sUdt; } /** * 是否约束 - * - * @return */ private boolean IsConstraint(SimpleDataTypeDef sUdt, String propertyName) { if (sUdt.getPropertyUseTypeInfos().containsKey(propertyName)) { @@ -189,7 +186,7 @@ public class UpdateVoElementUtil { UdtElement newElement; if (cUdt.getElements().size() == 1 && cUdt.getDbInfo().getMappingType() != ColumnMapType.SingleColumn) { - newElement = (UdtElement) ((cUdt.getElements().get(0) instanceof UdtElement) ? cUdt.getElements().get(0) : null); + newElement = (UdtElement) cUdt.getElements().get(0); } else { newElement = new UdtElement(cUdt.getPropertys()); } @@ -226,33 +223,32 @@ public class UpdateVoElementUtil { asso.setRefObjectCode(udtAsso.getRefObjectCode()); asso.setRefObjectID(udtAsso.getRefObjectID()); asso.setRefObjectName(udtAsso.getRefObjectName()); - if (udtAsso.getKeyCollection().size() > 0) { + if (!CollectionUtils.isEmpty(udtAsso.getKeyCollection())) { for (GspAssociationKey key : udtAsso.getKeyCollection()) { asso.getKeyCollection().add(ConvertUdtAssoKey(key, ele)); } } if (isFirstChoose) { - if (udtAsso.getRefElementCollection().size() > 0) { + if (!CollectionUtils.isEmpty(udtAsso.getRefElementCollection())) { for (IGspCommonField refEle : udtAsso.getRefElementCollection()) { - asso.getRefElementCollection().add(ConvertUdtRefElement((UdtElement) ((refEle instanceof UdtElement) ? refEle : null), ele.getLabelID())); + asso.getRefElementCollection().add(ConvertUdtRefElement((UdtElement)refEle, ele.getLabelID())); } } } else { GspFieldCollection udtRefElements = udtAsso.getRefElementCollection().clone(null, udtAsso); // udt带出 - if (beAsso != null && beAsso.getRefElementCollection() != null && beAsso.getRefElementCollection().size() != 0) { + if (beAsso != null && !CollectionUtils.isEmpty(beAsso.getRefElementCollection())) { for (IGspCommonField refEle : beAsso.getRefElementCollection()) { if (refEle.getIsFromAssoUdt()) { - IGspCommonField refElement = udtRefElements.stream().filter(item -> { - return item.getRefElementId().equals(refEle.getRefElementId()); - }).findFirst().orElse(null); + IGspCommonField refElement = udtRefElements.stream() + .filter(item -> item.getRefElementId().equals(refEle.getRefElementId())) + .findFirst().orElse(null); -// var refElement = udtRefElements.Find(item => item.RefElementId == refEle.RefElementId); udtRefElements.remove(refElement); // udt仍包含，则加上；udt上已删，则不加。 if (refElement != null) { - IGspCommonElement refEle2 = ConvertUdtRefElement((UdtElement) ((refElement instanceof UdtElement) ? refElement : null), ele.getLabelID()); + IGspCommonElement refEle2 = ConvertUdtRefElement((UdtElement)refElement, ele.getLabelID()); refEle2.setID(refEle.getID()); asso.getRefElementCollection().add(refEle2); } @@ -261,9 +257,9 @@ public class UpdateVoElementUtil { } } } - if (udtRefElements.size() > 0) { + if (!udtRefElements.isEmpty()) { for (IGspCommonField refEle : udtRefElements) { - asso.getRefElementCollection().add(ConvertUdtRefElement((UdtElement) ((refEle instanceof UdtElement) ? refEle : null), ele.getLabelID())); + asso.getRefElementCollection().add(ConvertUdtRefElement((UdtElement) refEle, ele.getLabelID())); } } } @@ -300,10 +296,8 @@ public class UpdateVoElementUtil { bizEle.setUdtID(udtEle.getUdtID()); bizEle.setUdtName(udtEle.getUdtName()); bizEle.setUdtPkgName(udtEle.getUdtPkgName()); - switch (udtEle.getObjectType()) { - case Enum: - bizEle.setContainEnumValues(udtEle.getContainEnumValues()); - break; + if (udtEle.getObjectType() == GspElementObjectType.Enum) { + bizEle.setContainEnumValues(udtEle.getContainEnumValues()); } // 虚拟vo字段 if (isVirtual) { diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoVariableUtil.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoVariableUtil.java index 60cf34b6b5a95d2c8a40269df198a78560e68a2b..340e6f74b4d199c2abb41b1e59e6a30e4cbe9c76 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoVariableUtil.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/util/UpdateVoVariableUtil.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.viewmodel.util; @@ -17,23 +33,12 @@ import com.inspur.edp.udt.designtime.api.entity.dbInfo.ColumnInfo; import com.inspur.edp.udt.designtime.api.entity.dbInfo.ColumnMapType; import com.inspur.edp.udt.designtime.api.entity.element.UdtElement; import com.inspur.edp.udt.designtime.api.entity.enumtype.UseType; - -import java.util.UUID; +import org.apache.cxf.common.util.CollectionUtils; /** * 更新udt字段 */ public class UpdateVoVariableUtil { - /** - * 创建字段实例 - * - * @return - */ - private CommonVariable getChildElement() { - CommonVariable tempVar = new CommonVariable(); - tempVar.setID(UUID.randomUUID().toString()); - return tempVar; - } /** * 根据引用的udt元数据更新字段(模板约束均更新) @@ -41,12 +46,10 @@ public class UpdateVoVariableUtil { * @param element * @param udt */ - public final void UpdateElementWithRefUdt(CommonVariable element, UnifiedDataTypeDef udt, boolean isFirstChoose) { element.setUdtID(udt.getId()); element.setUdtName(udt.getName()); - // 其他属性 if (udt instanceof ComplexDataTypeDef) { UpdateComplexDataTypeDefProperties(element, (ComplexDataTypeDef) udt); @@ -61,23 +64,8 @@ public class UpdateVoVariableUtil { * @param info * @param prefix * @param ele 映射字段 - * @return */ public final void MapColumnInfoToField(ColumnInfo info, String prefix, CommonVariable ele) { -// if (DotNetToJavaStringHelper.isNullOrEmpty(prefix)) -// { -// throw new BffException("请先完善当前字段的[编号]及[标签]。"); -// } -// -// var newLabelId = prefix + "_" + info.Code; -// ele.LabelID = newLabelId; -// ele.Code = newLabelId; -// ele.setName(info.getName()); -// ele.MDataType = info.MDataType; -// ele.DefaultValue = info.DefaultValue; -// ele.setLength(info.getLength()); -// ele.Precision = info.Precision; -// } } ///#region 单值 @@ -113,18 +101,14 @@ public class UpdateVoVariableUtil { element.setChildAssociations(new GspAssociationCollection()); } - IGspCommonField belongElement = (element.getChildAssociations() != null && element.getChildAssociations().size() > 0) ? element.getChildAssociations().get(0).getBelongElement() : null; + IGspCommonField belongElement = (!element.getChildAssociations().isEmpty()) ? + element.getChildAssociations().get(0).getBelongElement() : null; GspAssociationCollection assos = element.getChildAssociations().clone(belongElement); element.getChildAssociations().clear(); - if (sUdt.getChildAssociations() != null && sUdt.getChildAssociations().size() > 0) { + if (!CollectionUtils.isEmpty(sUdt.getChildAssociations())) { throw new ViewModelException(VoModelErrorCodes.GSP_VIEWOBJECT_MODEL_1052, null); - //foreach (GspAssociation item in sUdt.ChildAssociations) - //{ - // var beAsso = assos?.Find(asso => asso.Id == item.Id); - // element.ChildAssociations.Add(ConvertUdtAssociation(item, element, beAsso, isFirstChoose)); - //} } element.setEnumIndexType(sUdt.getEnumIndexType()); @@ -183,7 +167,7 @@ public class UpdateVoVariableUtil { UdtElement newElement; if (cUdt.getElements().size() == 1 && cUdt.getDbInfo().getMappingType() != ColumnMapType.SingleColumn) { - newElement = (UdtElement) ((cUdt.getElements().get(0) instanceof UdtElement) ? cUdt.getElements().get(0) : null); + newElement = (UdtElement)cUdt.getElements().get(0); } else { newElement = new UdtElement(cUdt.getPropertys()); } @@ -203,6 +187,5 @@ public class UpdateVoVariableUtil { element.setDefaultValue(newElement.getDefaultValue()); element.getChildAssociations().clear(); element.getContainEnumValues().clear(); - ///#endregion } } \ No newline at end of file diff --git a/view-object-model/src/test/java/com/inspur/gsp/AppTest.java b/view-object-model/src/test/java/com/inspur/gsp/AppTest.java deleted file mode 100644 index c785fc4acfd848244bcff3a4705eb6a2b274632d..0000000000000000000000000000000000000000 --- a/view-object-model/src/test/java/com/inspur/gsp/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspur.gsp; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml index 044c8e3a4500a81f473c51d52276c3f7d8b73457..f3c2ae47125d897a27ee92afb68e8c55a8ed4e6a 100644 --- a/view-object-rtwebapi/pom.xml +++ b/view-object-rtwebapi/pom.xml @@ -1,4 +1,20 @@ + + @@ -6,27 +22,22 @@ com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT view-object-rtwebapi - 0.1.2 jakarta.ws.rs jakarta.ws.rs-api - 2.1.5 com.inspur.edp view-object-model - compile - ${project.version} com.inspur.edp view-object-manager - ${project.version} com.inspur.edp diff --git a/view-object-voextendinfo-server-api/pom.xml b/view-object-voextendinfo-server-api/pom.xml index d5cf2ca4cb55410a60b64be02ce3f18f07e9c1bb..d16e1bfe05b12e3f6eda4485fa4ab9220c047a01 100644 --- a/view-object-voextendinfo-server-api/pom.xml +++ b/view-object-voextendinfo-server-api/pom.xml @@ -1,26 +1,39 @@ + + com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT 4.0.0 view-object-voextendinfo-server-api - 0.1.2 io.iec.edp caf-rpc-api - 0.3.4 com.inspur.edp view-object-model - ${project.version} diff --git a/view-object-voextendinfo-server-core/pom.xml b/view-object-voextendinfo-server-core/pom.xml index 37f580499765aba1ebc5cd9251714314fdf5345c..566c2db407ab0cf4b1bcd7ed9f98a469b2ac4e15 100644 --- a/view-object-voextendinfo-server-core/pom.xml +++ b/view-object-voextendinfo-server-core/pom.xml @@ -1,32 +1,43 @@ + + com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT 4.0.0 view-object-voextendinfo-server-core - 0.1.2 com.inspur.edp view-object-manager - ${project.version} io.iec.edp caf-rpc-api - 0.3.4 com.inspur.edp view-object-voextendinfo-server-api - compile - ${project.version} diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index 6e24a383d952b7112343af9a83ce3a592b6301da..54b66de27a98a056f7d3edc572f1f6c3df842477 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -23,32 +23,27 @@ com.inspur.edp viewObject-model1 - 0.1.2 + 0.1.4-SNAPSHOT view-object-webapi - 0.1.2 jakarta.ws.rs jakarta.ws.rs-api - 2.1.5 com.inspur.edp view-object-model - ${project.version} com.inspur.edp view-object-manager - ${project.version} com.inspur.edp view-object-api - ${project.version} com.inspur.edp @@ -81,13 +76,10 @@ com.inspur.edp web-help-metadata - 0.1.9 - compile com.inspur.edp wf-bizprocess-api - 0.3.5