多实例动态模型切面开发

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/aspect/DELogicAspect.java.ftl

@@ -91,6 +91,8 @@ public class DELogicAspect {
     private String dynamicPath;
     @Value("${r'$'}{ibiz.systemid:${sys.getCodeName()}}")
     private String systemId;
+    @Value("${r'$'}{ibiz.dynainstid:${sys.getCodeName()?lower_case}}")
+    private String dynamicId;
     private static Map<String, Object> validLogic = new HashMap<>();
 
     /**
@@ -249,7 +251,7 @@ public class DELogicAspect {
      */
     private void executeLogic(File bpmnFile, Object entity, String action, LogicMode logicMode) {
         log.debug("开始执行实体处理逻辑[{}:{}:{}:{}]", entity.getClass().getSimpleName(), action, bpmnFile.getName(), logicMode.text);
-        String bpmnId = DigestUtils.md5DigestAsHex(bpmnFile.getName().getBytes());
+        String bpmnId = DigestUtils.md5DigestAsHex(bpmnFile.getPath().getBytes());
         DELogic logic = getDELogic(bpmnFile, entity, logicMode);
         if (logic == null) {
             return;
@@ -436,7 +438,7 @@ public class DELogicAspect {
     }
 
     /**
-     * 远程逻辑
+     * 本地逻辑
      *
      * @param entity
      * @param action
@@ -451,7 +453,7 @@ public class DELogicAspect {
     }
 
     /**
-     * 本地逻辑
+     * 远程逻辑
      *
      * @param module
      * @param entity
@@ -461,7 +463,7 @@ public class DELogicAspect {
      */
     private File getRemoteModel(String module, String entity, String action, String actionLogic) {
         String logicName = String.format("psdeaction.json.%s.bpmn", actionLogic);
-        return new File(dynamicPath + File.separator + (systemId + File.separator + "psmodules" + File.separator + module + File.separator + "psdataentities" + File.separator + entity + File.separator + "psdeactions" + File.separator + action + File.separator + logicName).toLowerCase());
+        return new File(dynamicPath + File.separator + (systemId + File.separator + dynamicId + File.separator + "psmodules" + File.separator + module + File.separator + "psdataentities" + File.separator + entity + File.separator + "psdeactions" + File.separator + action + File.separator + logicName).toLowerCase());
     }
 
     /**
@@ -474,7 +476,7 @@ public class DELogicAspect {
      */
     private File getSubBpmn(String module, String entity, String logicName, LogicMode logicMode) {
         if (LogicMode.REMOTE.equals(logicMode)) {
-            return new File(dynamicPath + File.separator + (systemId + File.separator + "psmodules" + File.separator + module + File.separator + "psdataentities" + File.separator + entity + File.separator + "psdelogics" + File.separator + logicName + File.separator + "psdelogic.json.bpmn").toLowerCase());
+            return new File(dynamicPath + File.separator + (systemId + File.separator + dynamicId + File.separator + "psmodules" + File.separator + module + File.separator + "psdataentities" + File.separator + entity + File.separator + "psdelogics" + File.separator + logicName + File.separator + "psdelogic.json.bpmn").toLowerCase());
         } else {
             String filePath = String.format("/rules/%s", logicName);
             return ObjectUtils.isEmpty(this.getClass().getResource(filePath)) ? null : new File(this.getClass().getResource(filePath).getPath());