去重

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

@@ -9,6 +9,7 @@ import lombok.*;
 
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @NoArgsConstructor
@@ -20,9 +21,9 @@ public class AssembleModel {
     private List<EntityModel> entityModels;
     private List<DAMetric> metrics;
 
+    private List<DstDataSource> dataSources;
+    private List<DstSystem> systems;
     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

@@ -17,7 +17,6 @@ import cn.ibizlab.core.lite.service.*;
 import cn.ibizlab.core.lite.service.impl.MetaModelServiceImpl;
 import cn.ibizlab.core.rule.domain.RuleItem;
 import cn.ibizlab.core.rule.service.IRuleItemService;
-import cn.ibizlab.util.dict.Option;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.errors.InternalServerErrorException;
 import com.alibaba.fastjson.JSON;
@@ -34,6 +33,7 @@ import org.springframework.util.DigestUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -242,9 +242,13 @@ public class MetaModelExService extends MetaModelServiceImpl {
     public AssembleModel getModel(MetaModel et) {
         String modelId = et.getId();
         AssembleModel models = new AssembleModel();
+        Map<String,DstSystem> systemMap = new HashMap();
+        Map<String,DstDataSource> sourceMap = new HashMap();
         List<DAMetric> metrics = new ArrayList<>();
-        LinkedHashSet<DstDataSource> dataSources = new LinkedHashSet();
-        LinkedHashSet<DstSystem> systems = new LinkedHashSet();
+        List<DstSystem> listSystem = new ArrayList<>();
+        List<DstDataSource> listDataSource = new ArrayList<>();
+        List<Map<String,DstDataSource>> dataSources = new ArrayList();
+        List<Map<String,DstSystem>> systems = new ArrayList<>();
         LinkedHashSet<String> entities = new LinkedHashSet<>();
         //  查询模型
         MetaModel metaModel = metaModelService.get(et.getId());
@@ -290,14 +294,15 @@ public class MetaModelExService extends MetaModelServiceImpl {
         List<EntityModel> entityModels = getEntityModel(modelId);
         for (EntityModel entityModel:entityModels) {
             if(!ObjectUtils.isEmpty(entityModel.getEntity().getDataSource())){
-                dataSources.add(entityModel.getEntity().getDataSource());
+                sourceMap.put(entityModel.getEntity().getDataSource().getDsId(),entityModel.getEntity().getDataSource());
             }
             if(!ObjectUtils.isEmpty(entityModel.getEntity().getSystem())){
-                systems.add(entityModel.getEntity().getSystem());
+                systemMap.put(entityModel.getEntity().getSystem().getPssystemid(),entityModel.getEntity().getSystem());
+                systems.add(systemMap);
             }
         }
-        models.setDataSources(dataSources);
-        models.setSystems(systems);
+        models.setDataSources(new ArrayList<>(sourceMap.values()));
+        models.setSystems(new ArrayList<>(systemMap.values()));
         models.setEntityModels(entityModels);
         models.setMetaModel(metaModel);
         models.setRuleItems(metaModel.getRuleitems());