副本逻辑优化

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

@@ -70,14 +70,18 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
     @Override
     public boolean create(MetaDynamicModel et) {
         et.setConfigid((String)et.getDefaultKey(true));
-        super.create(et);
-        return unzip(et);
+        JSONObject system =  unzip(et);
+        boolean result = super.create(et);
+        createSubDynaInst(et,system);
+        return result;
     }
 
     @Override
     public boolean update(MetaDynamicModel et) {
-        super.update(et);
-        return unzip(et);
+        JSONObject system =  unzip(et);
+        boolean result = super.update(et);
+        createSubDynaInst(et,system);
+        return result;
     }
 
     /**
@@ -85,7 +89,7 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
      *
      * @param et
      */
-    private boolean unzip(MetaDynamicModel et) {
+    private JSONObject unzip(MetaDynamicModel et) {
         try {
             File modelFile = null;
             JSONObject system = null;
@@ -115,8 +119,24 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
             }else{
                 throw new BadRequestAlertException("文件后缀名异常，请以zip或tar.gz作为后缀名", "MetaDynamicModel", "unzip");
             }
-            et.setDynainstid(system.getString("getPSDynaInstId"));
-            et.setSystemId(system.getString("name"));
+            if(!ObjectUtils.isEmpty(system)) {
+                et.setDynainstid(system.getString("getPSDynaInstId"));
+                et.setSystemId(system.getString("name"));
+            }
+            return system;
+        } catch (IOException e) {
+            throw new BadRequestAlertException("解析动态模型文件失败，" + e, "MetaDynamicModel", "unzip");
+        }
+    }
+
+    /**
+     * 创建副本实例
+     * @param et
+     * @param system
+     * @return
+     */
+    private void createSubDynaInst(MetaDynamicModel et,JSONObject system){
+        if(!ObjectUtils.isEmpty(system)){
             JSONArray array = system.getJSONArray("getPSDynaInsts");
             List<MetaDynamicModel> metaDynamicModels = new ArrayList<>();
             if(!ObjectUtils.isEmpty(array)){
@@ -133,9 +153,6 @@ public class MetaDynamicModelExService extends MetaDynamicModelServiceImpl {
                 }
                 dynamicModelService.saveOrUpdateBatch(metaDynamicModels);
             }
-            return true;
-        } catch (IOException e) {
-            throw new BadRequestAlertException("解析动态模型文件失败，" + e, "MetaDynamicModel", "unzip");
         }
     }