添加数据集

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

@@ -21,6 +21,7 @@ public class AssembleModel {
     private List<DAMetric> metrics;
 
     private LinkedHashSet<MetaDataSet> metaDataSets;
+    private LinkedHashSet<DstDataSource> dataSources;
     private LinkedHashSet<MetaRelationship> references;
     private LinkedHashSet<MetaRelationship> nesteds;
     private LinkedHashSet<MetaField> metaFields;

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

@@ -72,6 +72,10 @@ public class MetaModelExService extends MetaModelServiceImpl {
     @Lazy
     private IMetaEntityService metaEntityService;
 
+    @Resource
+    @Lazy
+    private IDstDataSourceService dstDataSourceService;
+
     @Autowired
     @Lazy
     private IMetaDataSetService dataSetService;
@@ -161,6 +165,13 @@ public class MetaModelExService extends MetaModelServiceImpl {
                         entities.add(item.getEntity());
                     });
                     if(entities.size()>0){
+                        LinkedHashSet<DstDataSource> dataSource = new LinkedHashSet();
+                        for (MetaEntity entity : entities) {
+                            if(!ObjectUtils.isEmpty(entity.getDataSource())){
+                                dataSource.add(entity.getDataSource());
+                            }
+                        }
+                        dstDataSourceService.saveBatch(dataSource);
                         metaEntityService.saveBatch(entities);
                     }
                     if(p_relations.size()>0){
@@ -232,6 +243,7 @@ public class MetaModelExService extends MetaModelServiceImpl {
         String modelId = et.getId();
         AssembleModel models = new AssembleModel();
         List<DAMetric> metrics = new ArrayList<>();
+        LinkedHashSet<DstDataSource> dataSources = new LinkedHashSet();
         LinkedHashSet<String> entities = new LinkedHashSet<>();
         //  查询模型
         MetaModel metaModel = metaModelService.get(et.getId());
@@ -274,7 +286,14 @@ public class MetaModelExService extends MetaModelServiceImpl {
             }
         }
         // 将关联的数据集，上下级关系，字段一并存入
-        models.setEntityModels(getEntityModel(modelId));
+        List<EntityModel> entityModels = getEntityModel(modelId);
+        for (EntityModel entityModel:entityModels) {
+            if(!ObjectUtils.isEmpty(entityModel.getEntity().getDataSource())){
+                dataSources.add(entityModel.getEntity().getDataSource());
+            }
+        }
+        models.setDataSources(dataSources);
+        models.setEntityModels(entityModels);
         models.setMetaModel(metaModel);
         models.setRuleItems(metaModel.getRuleitems());
         models.setDaBuilds(metaModel.getBuilds());