添加模型系统

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/domain/AssembleModel.java

@@ -22,6 +22,7 @@ public class AssembleModel {
 
     private LinkedHashSet<MetaDataSet> metaDataSets;
     private LinkedHashSet<DstDataSource> dataSources;
+    private LinkedHashSet<DstSystem> systems;
     private LinkedHashSet<MetaRelationship> references;
     private LinkedHashSet<MetaRelationship> nesteds;
     private LinkedHashSet<MetaField> metaFields;

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/MetaModelExService.java

@@ -88,6 +88,10 @@ public class MetaModelExService extends MetaModelServiceImpl {
     @Lazy
     private IMetaFieldService fieldService;
 
+    @Autowired
+    @Lazy
+    private IDstSystemService dstSystemService;
+
     @Value("${ibiz.filePath:/app/file/}")
     private String fileRoot;
 
@@ -166,13 +170,18 @@ public class MetaModelExService extends MetaModelServiceImpl {
                     });
                     if(entities.size()>0){
                         LinkedHashSet<DstDataSource> dataSource = new LinkedHashSet();
+                        LinkedHashSet<DstSystem> systems = new LinkedHashSet();
                         for (MetaEntity entity : entities) {
                             if(!ObjectUtils.isEmpty(entity.getDataSource())){
                                 dataSource.add(entity.getDataSource());
                             }
+                            if(!ObjectUtils.isEmpty(entity.getSystem())){
+                                systems.add(entity.getSystem());
+                            }
                         }
-                        dstDataSourceService.saveBatch(dataSource);
+                        dstSystemService.saveBatch(systems);
                         metaEntityService.saveBatch(entities);
+                        dstDataSourceService.saveBatch(dataSource);
                     }
                     if(p_relations.size()>0){
                         relationshipService.saveBatch(p_relations);
@@ -244,6 +253,7 @@ public class MetaModelExService extends MetaModelServiceImpl {
         AssembleModel models = new AssembleModel();
         List<DAMetric> metrics = new ArrayList<>();
         LinkedHashSet<DstDataSource> dataSources = new LinkedHashSet();
+        LinkedHashSet<DstSystem> systems = new LinkedHashSet();
         LinkedHashSet<String> entities = new LinkedHashSet<>();
         //  查询模型
         MetaModel metaModel = metaModelService.get(et.getId());
@@ -291,8 +301,12 @@ public class MetaModelExService extends MetaModelServiceImpl {
             if(!ObjectUtils.isEmpty(entityModel.getEntity().getDataSource())){
                 dataSources.add(entityModel.getEntity().getDataSource());
             }
+            if(!ObjectUtils.isEmpty(entityModel.getEntity().getSystem())){
+                systems.add(entityModel.getEntity().getSystem());
+            }
         }
         models.setDataSources(dataSources);
+        models.setSystems(systems);
         models.setEntityModels(entityModels);
         models.setMetaModel(metaModel);
         models.setRuleItems(metaModel.getRuleitems());