2022.11.01.002 处理逻辑相关调整

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/LogicLinkModel.java

@@ -43,10 +43,7 @@ public class LogicLinkModel extends BaseModel {
     }
 
     public String getTargetNodeId() {
-        String strTargetNodeId = this.getPSDELogicLink().getSrcPSDELogicNode().getCodeName().toLowerCase();
-        if (this.getPSDELogicLink().getPSDELogicLinkGroupCond() != null) {
-            strTargetNodeId = String.format("gateway-%s", strTargetNodeId);
-        }
+        String strTargetNodeId = this.getPSDELogicLink().getDstPSDELogicNode().getCodeName().toLowerCase();
         return strTargetNodeId;
     }
 

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/LogicModel.java

@@ -50,7 +50,7 @@ public class LogicModel extends BaseModel {
                     bpmnTnsParams.add(bpmnGlobalIdentifier);
                 } else {
                     String strDataType = "java.util.Map";
-                    ruleGlobalParams.add(String.format("global %s %s;", strDataType, strParamName));
+                    ruleGlobalParams.add(String.format("global %s %s;", strDataType, "param_"+strParamName));
                 }
             }
         }
@@ -72,7 +72,7 @@ public class LogicModel extends BaseModel {
                     Method method = iPSDELogicNode.getClass().getDeclaredMethod("getDstPSDataEntity");
                     IPSDataEntity dstPSDataEntity = (IPSDataEntity) method.invoke(iPSDELogicNode);
                     if (!map.containsKey(dstPSDataEntity.getName())) {
-                        String strDataType = String.format("%s.core.%s.service.I%sService",
+                        String strDataType = String.format("%s.core.%s.service.%sService",
                                 entityModel.getSystem().getPackageName(),
                                 dstPSDataEntity.getPSSystemModule().getCodeName().toLowerCase(),
                                 dstPSDataEntity.getCodeName()
@@ -80,7 +80,7 @@ public class LogicModel extends BaseModel {
                         ruleGlobalParams.add(String.format("global %s %s;", strDataType, String.format("%sservice", dstPSDataEntity.getCodeName().toLowerCase())));
                         map.put(dstPSDataEntity.getName(), dstPSDataEntity.getName());
 
-                        String bpmnService = String.format("<tns:metaData express=\"T(cn.ibizlab.util.security.SpringContextHolder).getBean(T(%s.core.%s.service.I%sService))\" name=\"%sservice\" type=\"service\"/>",
+                        String bpmnService = String.format("<tns:metaData express=\"T(cn.ibizlab.util.security.SpringContextHolder).getBean(T(%s.core.%s.service.%sService))\" name=\"%sservice\" type=\"service\"/>",
                                 entityModel.getSystem().getPackageName(),
                                 dstPSDataEntity.getPSSystemModule().getCodeName().toLowerCase(),
                                 dstPSDataEntity.getCodeName(),

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/@macro/logic/drl/DEAction.hbs

 {{#if (eq logicNodeModel.pSDELogicNode.dstPSDEAction.codeName 'Get')}}
-    cn.ibizlab.util.helper.CachedBeanCopier.copy({{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.get({{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.get{{logicNodeModel.pSDELogicNode.dstPSDataEntity.keyPSDEField.codeName}}()),{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}});
+    cn.ibizlab.util.helper.CachedBeanCopier.copy({{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.get(param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.get{{logicNodeModel.pSDELogicNode.dstPSDataEntity.keyPSDEField.codeName}}()),param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}});
 {{else}}
 {{#if (eq logicNodeModel.pSDELogicNode.dstPSDEAction.codeName 'Remove')}}
-    {{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.remove({{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.get{{logicNodeModel.pSDELogicNode.dstPSDataEntity.keyPSDEField.codeName}}());
+    {{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.remove(param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.get{{logicNodeModel.pSDELogicNode.dstPSDataEntity.keyPSDEField.codeName}}());
 {{else}}
-    {{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.{{camelCase logicNodeModel.pSDELogicNode.dstPSDEAction.codeName}}({{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}});
+    {{lowerCase logicNodeModel.pSDELogicNode.dstPSDataEntity.codeName}}service.{{camelCase logicNodeModel.pSDELogicNode.dstPSDEAction.codeName}}(param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}});
 {{/if}}
 {{/if}}

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/@macro/logic/drl/PrepareParam.hbs

 {{#each logicNodeModel.pSDELogicNode.pSDELogicNodeParams as |nodeParam|}}
-    {{#if (eq nodeParam.srcValueType "SRCVALUE")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}","{{nodeParam.srcValue}}");{{/if}}
-    {{#if (eq nodeParam.srcValueType "SRCDLPARAM")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
-    {{#if (eq nodeParam.srcValueType "CURTIME")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",(new java.sql.Timestamp(new java.util.Date().getTime()))));{{/if}}
-    {{#if (eq nodeParam.srcValueType "OPERATOR")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getUserid());{{/if}}
-    {{#if (eq nodeParam.srcValueType "OPERATORNAME")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getPersonname());{{/if}}
-    {{#if (eq nodeParam.srcValueType "CONTEXT")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",default.get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
-    {{#if (eq nodeParam.srcValueType "SESSION")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getSessionParams().get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
-    {{#if (eq nodeParam.srcValueType "NULLVALUE")}}{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",null);{{/if}}
+    {{#if (eq nodeParam.srcValueType "SRCVALUE")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}","{{nodeParam.srcValue}}");{{/if}}
+    {{#if (eq nodeParam.srcValueType "SRCDLPARAM")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",param_{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
+    {{#if (eq nodeParam.srcValueType "CURTIME")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",(new java.sql.Timestamp(new java.util.Date().getTime()))));{{/if}}
+    {{#if (eq nodeParam.srcValueType "OPERATOR")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getUserid());{{/if}}
+    {{#if (eq nodeParam.srcValueType "OPERATORNAME")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getPersonname());{{/if}}
+    {{#if (eq nodeParam.srcValueType "CONTEXT")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",param_default.get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
+    {{#if (eq nodeParam.srcValueType "SESSION")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",curuser.getSessionParams().get("{{lowerCase nodeParam.srcFieldName}}"));{{/if}}
+    {{#if (eq nodeParam.srcValueType "NULLVALUE")}}param_{{lowerCase nodeParam.dstPSDELogicParam.codeName}}.set("{{lowerCase nodeParam.dstFieldName}}",null);{{/if}}
 {{/each}}
\ No newline at end of file

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/@macro/logic/drl/RawSQLAndLoopCall.hbs

@@ -2,7 +2,7 @@
     Map param =new HashMap();
     {{#each logicNodeModel.pSDELogicNode.pSDELogicNodeParams as |nodeParam|}}
         {{#if (eq nodeParam.srcValueType "SRCDLPARAM")}}
-    param.put("param{{@index}}",{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));
+    param.put("param{{@index}}",param_{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));
         {{/if}}
         {{#if (eq nodeParam.srcValueType "WEBCONTEXT")}}
     param.put("param{{@index}}",default.get("{{lowerCase nodeParam.srcFieldName}}"));

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/@macro/logic/drl/RawSQLCall.hbs

@@ -2,7 +2,7 @@
     Map param =new HashMap();
     {{#each logicNodeModel.pSDELogicNode.pSDELogicNodeParams as |nodeParam|}}
         {{#if (eq nodeParam.srcValueType "SRCDLPARAM")}}
-    param.put("param{{@index}}",{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));
+    param.put("param{{@index}}",param_{{lowerCase nodeParam.srcPSDELogicParam.codeName}}.get("{{lowerCase nodeParam.srcFieldName}}"));
         {{/if}}
         {{#if (eq nodeParam.srcValueType "WEBCONTEXT")}}
             param.put("param{{@index}}",default.get("{{lowerCase nodeParam.srcFieldName}}"));
@@ -40,10 +40,10 @@
             JSONObject entity=entities.get(0);
         {{#if logicNodeModel.pSDELogicNode.dstPSDELogicParam.paramPSDataEntity}}
             for (Map.Entry entry : entity.entrySet()) {
-                {{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.set(String.valueOf(entry.getKey()),entry.getValue());
+                param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.set(String.valueOf(entry.getKey()),entry.getValue());
             }
         {{else}}
-            {{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.putAll(entity);
+                param_{{lowerCase logicNodeModel.pSDELogicNode.dstPSDELogicParam.codeName}}.putAll(entity);
         {{/if}}
         }
     {{else}}

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-core/src/main/resources/rules/{{entities}}/{{entityLogics}}Rule.drl.hbs

@@ -16,7 +16,7 @@ no-loop
 
 //逻辑处理节点[{{logicNodeModel.name}}]
 rule "{{lowerCase logicNodeModel.codeName}}"
-ruleflow-group "{{lowerCase logicNodeModel.codeName}}"
+ruleflow-group "{{lowerCase logicNodeModel.codeName}}group"
   when
   then
 {{#eq logicNodeModel.logicNodeType "PREPAREPARAM"}}{{> @macro/logic/drl/PrepareParam.hbs logicNodeModel=logicNodeModel}}{{/eq}}

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-core/src/main/resources/rules/{{entities}}/{{entityLogics}}RuleFlow.bpmn.hbs

@@ -30,7 +30,7 @@
     {{#if (eq logicNodeModel.getLogicNodeType 'BEGIN')}}
         <startEvent id="{{lowerCase logicNodeModel.codeName}}" isInterrupting="true"/>
     {{else}}
-        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="{{lowerCase logicNodeModel.codeName}}" id="{{lowerCase logicNodeModel.codeName}}" implementation="http://www.jboss.org/drools/rule" name="{{lowerCase logicNodeModel.name}}"/>
+        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="{{lowerCase logicNodeModel.codeName}}group" id="{{lowerCase logicNodeModel.codeName}}" implementation="http://www.jboss.org/drools/rule" name="{{lowerCase logicNodeModel.name}}"/>
     {{/if}}
     {{#if logicNodeModel.pSDELogicNode.getPSDELogicLinks}}
     {{else}}