提交

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

@@ -22,6 +22,6 @@ public class AssembleModel {
     private List<EntityModel> entityModels;
     private List<DAMetric> metrics;
     private List<DstDataSource> dataSources;
-    private List<DstSystem> systems;
+//    private List<DstSystem> systems;
 }
 

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

@@ -11,6 +11,8 @@ import cn.ibizlab.core.lite.domain.*;
 import cn.ibizlab.core.lite.extensions.domain.EntityModel;
 import cn.ibizlab.core.lite.extensions.domain.FieldModel;
 import cn.ibizlab.core.lite.extensions.domain.RelationshipModel;
+import cn.ibizlab.core.lite.extensions.mapping.MetaEntityMapping;
+import cn.ibizlab.core.lite.extensions.mapping.MetaFieldMapping;
 import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.model.Property;
 import cn.ibizlab.core.lite.extensions.service.LiteModelService;
@@ -101,6 +103,14 @@ public class MetaModelExService extends MetaModelServiceImpl {
     @Lazy
     private IDstSystemService dstSystemService;
 
+    @Autowired
+    @Lazy
+    MetaEntityMapping entityMapping;
+
+    @Autowired
+    @Lazy
+    MetaFieldMapping fieldMapping;
+
     @Value("${ibiz.filePath:/app/file/}")
     private String fileRoot;
 
@@ -168,14 +178,14 @@ public class MetaModelExService extends MetaModelServiceImpl {
                             List<FieldModel> fieldModels = item.getFields();
                             for(FieldModel fieldModel : fieldModels){
                                 if(!ObjectUtils.isEmpty(fieldModel.getField())){
-                                    fields.add(fieldModel.getField());
+                                    fields.add(fieldMapping.toDomain(fieldModel.getField()));
                                 }
                             }
                         }
                         if(!ObjectUtils.isEmpty(item.getDataSets())){
                             dataSets.addAll(item.getDataSets());
                         }
-                        entities.add(item.getEntity());
+                        entities.add(entityMapping.toDomain(item.getEntity()));
                     });
                     //核心数据导入
                     if (model.getMetaModel() != null) {
@@ -184,9 +194,9 @@ public class MetaModelExService extends MetaModelServiceImpl {
                     if (model.getEntityModels().size() > 0) {
                         metaEntityService.saveBatch(entities);
                     }
-                    if (model.getSystems().size() > 0) {
-                        dstSystemService.saveBatch(model.getSystems());
-                    }
+//                    if (model.getSystems().size() > 0) {
+//                        dstSystemService.saveBatch(model.getSystems());
+//                    }
                     if (model.getDataSources().size() > 0) {
                         dstDataSourceService.saveBatch(model.getDataSources());
                     }
@@ -294,9 +304,9 @@ public class MetaModelExService extends MetaModelServiceImpl {
         LinkedHashSet masterDsName = new LinkedHashSet();
         for (EntityModel entityModel : entityModels) {
             masterDsName.add(entityModel.getDsName());
-            if (!ObjectUtils.isEmpty(entityModel.getEntity())) {
-                systemMap.put(entityModel.getEntity().getSystem().getPssystemid(), entityModel.getEntity().getSystem());
-            }
+//            if (!ObjectUtils.isEmpty(entityModel.getEntity())) {
+//                systemMap.put(entityModel.getEntity().getSystemId(), entityModel.getEntity().getSystem());
+//            }
         }
 
         // 查询数据源
@@ -313,7 +323,7 @@ public class MetaModelExService extends MetaModelServiceImpl {
         models.setDaBuilds(daBuilds);
         models.setRuleItems(ruleItems);
         models.setDataSources(dataSources);
-        models.setSystems(new ArrayList<>(systemMap.values()));
+//        models.setSystems(new ArrayList<>(systemMap.values()));
         return models;
     }
 

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/DstCoreResource.java

@@ -144,7 +144,7 @@ public class DstCoreResource {
         Property property=liteModelService.getDataModel(modelid).findObjectProperty(propertyname,"ALL");
         if(property!=null)
         {
-            MetaField field=property.getEntityModel().getField(fieldname).getField();
+            MetaFieldModel field=property.getEntityModel().getField(fieldname).getField();
             if(field!=null)
             {
                 String dict = field.getDict();