提交 04eb4bf5 编写于 作者: tangyaolong's avatar tangyaolong

修改代码的groupname,确保唯一性

上级 65c85e90
...@@ -51,14 +51,14 @@ TARGET=PSDEACTION ...@@ -51,14 +51,14 @@ TARGET=PSDEACTION
<#comment>实体行为附加逻辑</#comment> <#comment>实体行为附加逻辑</#comment>
<#if afterlogic.isInternalLogic() && afterlogic.getPSDELogic().isEnableBackend()> <#if afterlogic.isInternalLogic() && afterlogic.getPSDELogic().isEnableBackend()>
<#assign delogic = afterlogic.getPSDELogic()> <#assign delogic = afterlogic.getPSDELogic()>
<#assign target =afterlogic.getId()> <#assign target = afterlogic.getId()>
<callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${(de.codeName + delogic.codeName)+"RuleFlow.bpmn"}"/> <callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${(de.codeName + delogic.codeName)+"RuleFlow.bpmn"}"/>
<#elseif afterlogic.getDstPSDEAction()?? && afterlogic.getDstPSDEAction().isEnableBackend()> <#elseif afterlogic.getDstPSDEAction()?? && afterlogic.getDstPSDEAction().isEnableBackend()>
<#assign dataentity = afterlogic.getDstPSDE()> <#assign dataentity = afterlogic.getDstPSDE()>
<#assign deaction = afterlogic.getDstPSDEAction()> <#assign deaction = afterlogic.getDstPSDEAction()>
<#assign target = afterlogic.getId()> <#assign target = afterlogic.getId()>
<#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case> <#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${groupName}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${(dataentity.codeName + deaction.codeName)?lower_case}"/> <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${target}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${groupName}"/>
</#if> </#if>
<sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/> <sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/>
<#assign source = target> <#assign source = target>
......
...@@ -30,8 +30,9 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower ...@@ -30,8 +30,9 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
<#assign deaction = afterlogic.getDstPSDEAction()> <#assign deaction = afterlogic.getDstPSDEAction()>
<#assign dataentityCodeName = afterlogic.getDstPSDE().codeName> <#assign dataentityCodeName = afterlogic.getDstPSDE().codeName>
<#assign deactionCodeName = srfmethodname(afterlogic.getDstPSDEAction().codeName)> <#assign deactionCodeName = srfmethodname(afterlogic.getDstPSDEAction().codeName)>
<#assign target = (dataentity.codeName + deaction.codeName)?lower_case> <#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case>
rule "${target}" <#assign target = afterlogic.getId()>
rule "${groupName}"
ruleflow-group "${target}" ruleflow-group "${target}"
when when
then then
......
...@@ -58,7 +58,7 @@ TARGET=PSDEACTION ...@@ -58,7 +58,7 @@ TARGET=PSDEACTION
<#assign deaction = beforelogic.getDstPSDEAction()> <#assign deaction = beforelogic.getDstPSDEAction()>
<#assign target = beforelogic.getId()> <#assign target = beforelogic.getId()>
<#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case> <#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${groupName}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${(dataentity.codeName + deaction.codeName)?lower_case}"/> <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${target}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${(dataentity.codeName + deaction.codeName)?lower_case}"/>
</#if> </#if>
<sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/> <sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/>
<#assign source = target> <#assign source = target>
......
...@@ -30,8 +30,9 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower ...@@ -30,8 +30,9 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
<#assign deaction = beforelogic.getDstPSDEAction()> <#assign deaction = beforelogic.getDstPSDEAction()>
<#assign dataentityCodeName = beforelogic.getDstPSDE().codeName> <#assign dataentityCodeName = beforelogic.getDstPSDE().codeName>
<#assign deactionCodeName = srfmethodname(beforelogic.getDstPSDEAction().codeName)> <#assign deactionCodeName = srfmethodname(beforelogic.getDstPSDEAction().codeName)>
<#assign target = (dataentity.codeName + deaction.codeName)?lower_case> <#assign groupName = (dataentity.codeName + deaction.codeName)?lower_case>
rule "${target}" <#assign target = beforelogic.getId()>
rule "${groupName}"
ruleflow-group "${target}" ruleflow-group "${target}"
when when
then then
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册