Merge 83ba635bab into 08705c9d3b

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

@@ -439,8 +439,9 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         metricFilter.setBizName(bizName);
         metricFilter.setModelIds(Lists.newArrayList(modelId));
         List<MetricResp> metricResps = getMetrics(metricFilter);
+        MetricResp metricResp = null;
         if (CollectionUtils.isEmpty(metricResps)) {
-            return null;
+            return metricResp;
         }
         return metricResps.get(0);
     }

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java

@@ -241,28 +241,12 @@ public class ModelServiceImpl implements ModelService {
 
     private void batchCreateDimension(ModelDO modelDO, User user) throws Exception {
         List<DimensionReq> dimensionReqs = ModelConverter.convertDimensionList(modelDO);
-        List<DimensionReq> dimensionToCreate = new ArrayList<>();
+        dimensionService.createDimensionBatch(dimensionReqs, user);
-        for (DimensionReq dimensionReq : dimensionReqs) {
-            DimensionResp dimensionResp =
-                    dimensionService.getDimension(dimensionReq.getBizName(), modelDO.getId());
-            if (dimensionResp == null) {
-                dimensionToCreate.add(dimensionReq);
-            }
-        }
-        dimensionService.createDimensionBatch(dimensionToCreate, user);
     }
 
     private void batchCreateMetric(ModelDO modelDO, User user) throws Exception {
         List<MetricReq> metricReqs = ModelConverter.convertMetricList(modelDO);
-        List<MetricReq> metricToCreate = new ArrayList<>();
+        metricService.createMetricBatch(metricReqs, user);
-        for (MetricReq metricReq : metricReqs) {
-            MetricResp metricResp =
-                    metricService.getMetric(modelDO.getId(), metricReq.getBizName());
-            if (metricResp == null) {
-                metricToCreate.add(metricReq);
-            }
-        }
-        metricService.createMetricBatch(metricToCreate, user);
     }
 
     private void checkParams(ModelReq modelReq) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java

@@ -164,34 +164,19 @@ public class ModelConverter {
             fields.add(new Field(semanticColumn.getColumnName(), semanticColumn.getDataType()));
 
             if (getIdentifyType(fieldType) != null) {
-                Optional<Identify> optional = modelDetail.getIdentifiers().stream().filter(
+                Identify identify = new Identify(semanticColumn.getName(),
-                        identify -> identify.getBizName().equals(semanticColumn.getColumnName()))
+                        getIdentifyType(fieldType).name(), semanticColumn.getColumnName(), 1);
-                        .findAny();
+                modelDetail.getIdentifiers().add(identify);
-                if (optional.isEmpty()) {
-                    Identify identify = new Identify(semanticColumn.getName(),
-                            getIdentifyType(fieldType).name(), semanticColumn.getColumnName(), 1);
-                    modelDetail.getIdentifiers().add(identify);
-                }
             } else if (FieldType.measure.equals(fieldType)) {
-                Optional<Measure> optional = modelDetail.getMeasures().stream().filter(
+                Measure measure = new Measure(semanticColumn.getName(),
-                        measure -> measure.getBizName().equals(semanticColumn.getColumnName()))
+                        semanticColumn.getColumnName(), semanticColumn.getExpr(),
-                        .findAny();
+                        semanticColumn.getAgg().getOperator(), semanticColumn.getUnit(), 1);
-                if (optional.isEmpty()) {
+                modelDetail.getMeasures().add(measure);
-                    Measure measure = new Measure(semanticColumn.getName(),
-                            semanticColumn.getColumnName(), semanticColumn.getExpr(),
-                            semanticColumn.getAgg().getOperator(), semanticColumn.getUnit(), 1);
-                    modelDetail.getMeasures().add(measure);
-                }
             } else {
-                Optional<Dimension> optional = modelDetail.getDimensions().stream().filter(
+                Dimension dim = new Dimension(semanticColumn.getName(),
-                        dimension -> dimension.getBizName().equals(semanticColumn.getColumnName()))
+                        semanticColumn.getColumnName(), semanticColumn.getExpr(),
-                        .findAny();
+                        DimensionType.valueOf(semanticColumn.getFiledType().name()), 1);
-                if (optional.isEmpty()) {
+                modelDetail.getDimensions().add(dim);
-                    Dimension dim = new Dimension(semanticColumn.getName(),
-                            semanticColumn.getColumnName(), semanticColumn.getExpr(),
-                            DimensionType.valueOf(semanticColumn.getFiledType().name()), 1);
-                    modelDetail.getDimensions().add(dim);
-                }
             }
         }
         modelDetail.setFields(fields);