From 5a1a83c03e0b2582addb5fe4dd62f79b9d94c631 Mon Sep 17 00:00:00 2001 From: haoxiaofei Date: Tue, 18 Oct 2022 10:54:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style(vo-manager):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 代码格式调整、简化拉姆达表达式 --- .../vmmanager/TransferSerializer.java | 188 +++++++++--------- 1 file changed, 91 insertions(+), 97 deletions(-) diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/TransferSerializer.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/TransferSerializer.java index 17a8185..9578f1c 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/TransferSerializer.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/TransferSerializer.java @@ -44,119 +44,113 @@ import io.iec.edp.caf.commons.utils.SpringBeanUtils; public class TransferSerializer implements MetadataTransferSerializer { - //region getMapper - - private ObjectMapper getMapper() { - ObjectMapper mapper = new ObjectMapper(); - SimpleModule module = new SimpleModule(); - module.addDeserializer(IGspCommonModel.class, new ViewModelDeserializer()); - module.addSerializer(IGspCommonModel.class, new ViewModelSerializer()); - mapper.registerModule(module); - return mapper; - } - - //endregion - - //region 序列化 - public final String serialize(IMetadataContent metadataContent) { - GspViewModel viewModel = (GspViewModel) ((metadataContent instanceof GspViewModel) - ? metadataContent : null); -// dealContent(viewModel); - String modelJson = null; - try { - modelJson = getMapper().writeValueAsString(viewModel); - } catch (JsonProcessingException e) { - throw new RuntimeException("ViewModel序列化失败！"); + //region getMapper + + private ObjectMapper getMapper() { + ObjectMapper mapper = new ObjectMapper(); + SimpleModule module = new SimpleModule(); + module.addDeserializer(IGspCommonModel.class, new ViewModelDeserializer()); + module.addSerializer(IGspCommonModel.class, new ViewModelSerializer()); + mapper.registerModule(module); + return mapper; } - return modelJson; - } - private void dealContent(GspViewModel viewModel) { - dealObject(viewModel.getMainObject()); - } - - private void dealObject(GspViewObject viewObject) { - - ViewObjectCollection childObjs = viewObject.getContainChildObjects(); - if (childObjs != null && childObjs.size() > 0) { - childObjs.forEach((childObj) -> { - dealObject((GspViewObject) childObj); - }); + //endregion + + //region 序列化 + public final String serialize(IMetadataContent metadataContent) { + GspViewModel viewModel = (GspViewModel) ((metadataContent instanceof GspViewModel) + ? metadataContent : null); + String modelJson; + try { + modelJson = getMapper().writeValueAsString(viewModel); + } catch (JsonProcessingException e) { + throw new RuntimeException("ViewModel序列化失败！"); + } + return modelJson; } - VMElementCollection eles = viewObject.getContainElements(); - if (eles != null && eles.size() > 0) { - eles.forEach((ele) -> { - dealElement(ele); - }); + private void dealContent(GspViewModel viewModel) { + dealObject(viewModel.getMainObject()); } - } - private void dealElement(IGspCommonField element) { - if (element.getObjectType() != GspElementObjectType.Association) { - return; - } - - GspAssociationCollection assos = element.getChildAssociations(); - if (assos != null && assos.size() > 0) { - assos.forEach((asso) -> { - dealAssociation(asso); - }); - } - } + private void dealObject(GspViewObject viewObject) { - private void dealAssociation(GspAssociation association) { + ViewObjectCollection childObjs = viewObject.getContainChildObjects(); + if (childObjs != null && childObjs.size() > 0) { + childObjs.forEach((childObj) -> { + dealObject((GspViewObject) childObj); + }); + } - GspFieldCollection refEles = association.getRefElementCollection(); - if (refEles != null && refEles.size() > 0) { - refEles.forEach((refEle) -> { - dealRefElement(association, refEle); - }); + VMElementCollection eles = viewObject.getContainElements(); + if (eles != null && eles.size() > 0) { + eles.forEach(this::dealElement); + } } - } - private void dealRefElement(GspAssociation association, IGspCommonField refElement) { - if (refElement.getObjectType() != GspElementObjectType.Association) { - return; - } - RefCommonService service = SpringBeanUtils.getBean(RefCommonService.class); - GspMetadata refMetadata = service.getRefMetadata(association.getRefModelID()); - if (refMetadata == null) { - throw new VmManagerException("", "", - "关联be[" + association.getRefModelID() + "] [" + association.getRefModelCode() - + "]没有获取到。", - null, ExceptionLevel.Error, false); - } - GspBusinessEntity refBe = (GspBusinessEntity) refMetadata.getContent(); - IGspCommonObject refObj = refBe.findObjectById(association.getRefObjectID()); - if (refObj == null) { - throw new VmManagerException("", "", - "关联be[" + association.getRefModelCode() + "]中没有获取到节点[" + association.getRefObjectID() - + "] [" + association.getRefObjectCode() + "]。", null, ExceptionLevel.Error, - false); - } + private void dealElement(IGspCommonField element) { + if (element.getObjectType() != GspElementObjectType.Association) { + return; + } - IGspCommonElement element = refObj.findElement(refElement.getRefElementId()); - if (element == null) { - throw new VmManagerException("", "", - "关联be[" + association.getRefModelCode() + "]中没有获取到字段[" + refElement.getRefElementId() - + "] [" + refElement.getLabelID() + "]。", null, ExceptionLevel.Error, false); + GspAssociationCollection assos = element.getChildAssociations(); + if (assos != null && assos.size() > 0) { + assos.forEach(this::dealAssociation); + } } - refElement.getChildAssociations().addAll(element.getChildAssociations().clone()); + private void dealAssociation(GspAssociation association) { - dealElement(refElement); - } - //endregion + GspFieldCollection refEles = association.getRefElementCollection(); + if (refEles != null && refEles.size() > 0) { + refEles.forEach((refEle) -> { + dealRefElement(association, refEle); + }); + } + } + private void dealRefElement(GspAssociation association, IGspCommonField refElement) { + if (refElement.getObjectType() != GspElementObjectType.Association) { + return; + } + RefCommonService service = SpringBeanUtils.getBean(RefCommonService.class); + GspMetadata refMetadata = service.getRefMetadata(association.getRefModelID()); + if (refMetadata == null) { + throw new VmManagerException("", "", + "关联be[" + association.getRefModelID() + "] [" + association.getRefModelCode() + + "]没有获取到。", + null, ExceptionLevel.Error, false); + } + GspBusinessEntity refBe = (GspBusinessEntity) refMetadata.getContent(); + IGspCommonObject refObj = refBe.findObjectById(association.getRefObjectID()); + if (refObj == null) { + throw new VmManagerException("", "", + "关联be[" + association.getRefModelCode() + "]中没有获取到节点[" + association.getRefObjectID() + + "] [" + association.getRefObjectCode() + "]。", null, ExceptionLevel.Error, + false); + } + + IGspCommonElement element = refObj.findElement(refElement.getRefElementId()); + if (element == null) { + throw new VmManagerException("", "", + "关联be[" + association.getRefModelCode() + "]中没有获取到字段[" + refElement.getRefElementId() + + "] [" + refElement.getLabelID() + "]。", null, ExceptionLevel.Error, false); + } + + refElement.getChildAssociations().addAll(element.getChildAssociations().clone()); + + dealElement(refElement); + } + //endregion - public final IMetadataContent deserialize(String contentString) { - try { - return getMapper().readValue(contentString, GspViewModel.class); - } catch (JsonProcessingException e) { - throw new VmManagerException("", "", "vo反序列化失败" + contentString, null, ExceptionLevel.Error, - false); + public final IMetadataContent deserialize(String contentString) { + try { + return getMapper().readValue(contentString, GspViewModel.class); + } catch (JsonProcessingException e) { + throw new VmManagerException("", "", "vo反序列化失败" + contentString, null, ExceptionLevel.Error, + false); + } } - } } -- Gitee From db4f34b8d9440264924bed9ec350fae6bba2fa4a Mon Sep 17 00:00:00 2001 From: haoxiaofei Date: Tue, 18 Oct 2022 11:34:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style(vo-model):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 代码格式调整,去除冗余代码 --- .../controlrule/ruledefine/VoControlRuleDef.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java index 8fb8f13..b7b090f 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java @@ -49,9 +49,7 @@ public class VoControlRuleDef extends CmControlRuleDef { }; setNameControlRule(nameRule); -// setUsingTimeStampControlRule(); - - ControlRuleDefItem addActionRule = new ControlRuleDefItem(){ + ControlRuleDefItem addActionRule = new ControlRuleDefItem() { { this.setRuleName(VoControlRuleDefNames.AddCustomAction); this.setRuleDisplayName("添加自定义动作"); @@ -61,7 +59,7 @@ public class VoControlRuleDef extends CmControlRuleDef { }; setAddCustomActonControlRule(addActionRule); - ControlRuleDefItem modifyActionRule = new ControlRuleDefItem(){ + ControlRuleDefItem modifyActionRule = new ControlRuleDefItem() { { this.setRuleName(VoControlRuleDefNames.ModifyCustomActions); this.setRuleDisplayName("修改自定义动作"); @@ -71,7 +69,7 @@ public class VoControlRuleDef extends CmControlRuleDef { }; setModifyCustomActonControlRule(modifyActionRule); - ControlRuleDefItem addVarRule = new ControlRuleDefItem(){ + ControlRuleDefItem addVarRule = new ControlRuleDefItem() { { this.setRuleName(VoControlRuleDefNames.AddVariableDtm); this.setRuleDisplayName("添加自定义变量"); @@ -81,7 +79,7 @@ public class VoControlRuleDef extends CmControlRuleDef { }; setAddVariableDtmControlRule(addVarRule); - ControlRuleDefItem modifyVarRule = new ControlRuleDefItem(){ + ControlRuleDefItem modifyVarRule = new ControlRuleDefItem() { { this.setRuleName(VoControlRuleDefNames.ModifyVariableDtm); this.setRuleDisplayName("修改自定义变量"); -- Gitee