适配动态系统zip目录调整

ibzlite-core/src/main/java/cn/ibizlab/core/extensions/service/MetaDynamicModelExService.java

@@ -42,6 +42,8 @@ import java.util.Map;
 @Service("MetaDynamicModelExService")
 public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
 
+    private static final String wf_regex="\\w+WFv\\d+.json.bpmn";
+
     @Override
     protected Class currentModelClass() {
         return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
@@ -233,7 +235,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
         List<Map<String, Object>> models = new ArrayList<>();
         File publish = new File(path);
         if (!publish.exists()) {
-            throw new BadRequestAlertException(String.format("发布目录[%s]不存在", publish.getPath()), "MetaDynamicModel", "search");
+            throw new BadRequestAlertException(String.format("发布目录[%s]不存在", publish.getPath()), "MetaDynamicModel", "searchLogic");
         }
         File[] subFiles = publish.listFiles();
         if (null != subFiles) {
@@ -243,7 +245,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
                     if (!ObjectUtils.isEmpty(subModels)) {
                         models.addAll(subModels);
                     }
-                } else if (subFile.isFile() && (!subFile.getName().equalsIgnoreCase("PSWFVERSION.json.bpmn")) && (subFile.getName().endsWith(".bpmn") || subFile.getName().endsWith(".drl"))) {
+                } else if (subFile.isFile() && (!subFile.getName().matches(wf_regex)) && (subFile.getName().endsWith(".bpmn") || subFile.getName().endsWith(".drl"))) {
                     InputStream file = null;
                     try {
                         file = new FileInputStream(subFile);
@@ -277,7 +279,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
         List<Map<String, Object>> models = new ArrayList<>();
         File publish = new File(pubPath);
         if (!publish.exists()) {
-            throw new BadRequestAlertException(String.format("发布目录[%s]不存在", publish.getPath()), "MetaDynamicModel", "search");
+            throw new BadRequestAlertException(String.format("发布目录[%s]不存在", publish.getPath()), "MetaDynamicModel", "searchWorkFlow");
         }
         File[] subFiles = publish.listFiles();
         if (null != subFiles) {
@@ -287,7 +289,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
                     if (!ObjectUtils.isEmpty(subModels)) {
                         models.addAll(subModels);
                     }
-                } else if (subFile.isFile() && (subFile.getName().equalsIgnoreCase("PSWFVERSION.json.bpmn"))) {
+                } else if (subFile.isFile() && (subFile.getName().matches(wf_regex))) {
                     InputStream file = null;
                     try {
                         file = new FileInputStream(subFile);
@@ -338,7 +340,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
         try {
             File file = new File(filePath + File.separator + "PSSYSTEM.json");
             if (!file.exists()) {
-                throw new BadRequestAlertException(String.format("无法找到动态系统模型文件[%s]", file.getPath()), "MetaDynamicModel", "getSystemId");
+                throw new BadRequestAlertException(String.format("无法找到动态系统模型文件[%s]", file.getPath()), "MetaDynamicModel", "getSystem");
             }
             in = new FileInputStream(file);
             bytes = new byte[in.available()];