优化代码

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

@@ -23,9 +23,5 @@ public class AssembleModel {
 
     private List<DstDataSource> dataSources;
     private List<DstSystem> systems;
-    private LinkedHashSet<MetaDataSet> metaDataSets;
-    private LinkedHashSet<MetaRelationship> references;
-    private LinkedHashSet<MetaRelationship> nesteds;
-    private LinkedHashSet<MetaField> metaFields;
 }
 

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

@@ -247,11 +247,10 @@ public class MetaModelExService extends MetaModelServiceImpl {
     @Transactional
     public AssembleModel getModel(MetaModel et) {
         String modelId = et.getId();
-        LinkedHashSet masterDsName = new LinkedHashSet();
         AssembleModel models = new AssembleModel();
         List<DAMetric> metrics = new ArrayList<>();
+        LinkedHashSet masterDsName = new LinkedHashSet();
         Map<String, DstSystem> systemMap = new HashMap();
-        List<Map<String, DstSystem>> systems = new ArrayList<>();
         LinkedHashSet<String> entities = new LinkedHashSet<>();
         //  查询模型
         MetaModel metaModel = metaModelService.get(et.getId());
@@ -299,9 +298,8 @@ public class MetaModelExService extends MetaModelServiceImpl {
         for (EntityModel entityModel : entityModels) {
                 masterDsName.add(entityModel.getDsName());
 
-            if (!ObjectUtils.isEmpty(entityModel.getEntity().getSystem())) {
+            if (!ObjectUtils.isEmpty(entityModel.getEntity())) {
                 systemMap.put(entityModel.getEntity().getSystem().getPssystemid(), entityModel.getEntity().getSystem());
-                systems.add(systemMap);
             }
         }
         // 查询数据源