diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java index 53c19f47c..6f8d1dbd6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java @@ -100,7 +100,7 @@ public class ModelServiceImpl implements ModelService { @Override @Transactional public ModelResp createModel(ModelReq modelReq, User user) throws Exception { - checkName(modelReq); + checkParams(modelReq); ModelDO modelDO = ModelConverter.convert(modelReq, user); modelRepository.createModel(modelDO); batchCreateDimension(modelDO, user); @@ -111,7 +111,7 @@ public class ModelServiceImpl implements ModelService { @Override @Transactional public ModelResp updateModel(ModelReq modelReq, User user) throws Exception { - checkName(modelReq); + checkParams(modelReq); ModelDO modelDO = modelRepository.getModelById(modelReq.getId()); ModelConverter.convert(modelDO, modelReq, user); modelRepository.updateModel(modelDO); @@ -196,7 +196,7 @@ public class ModelServiceImpl implements ModelService { metricService.createMetricBatch(metricReqs, user); } - private void checkName(ModelReq modelReq) { + private void checkParams(ModelReq modelReq) { String forbiddenCharacters = NameCheckUtils.findForbiddenCharacters(modelReq.getName()); if (StringUtils.isNotBlank(forbiddenCharacters)) { String message = String.format("模型名称[%s]包含特殊字符(%s), 请修改", modelReq.getName(), forbiddenCharacters); @@ -204,14 +204,10 @@ public class ModelServiceImpl implements ModelService { } List dims = modelReq.getModelDetail().getDimensions(); List measures = modelReq.getModelDetail().getMeasures(); - List timeDims = modelReq.getTimeDimension(); List identifies = modelReq.getModelDetail().getIdentifiers(); if (CollectionUtils.isEmpty(dims)) { throw new InvalidArgumentException("缺少维度信息"); } - if (!CollectionUtils.isEmpty(measures) && CollectionUtils.isEmpty(timeDims)) { - throw new InvalidArgumentException("有度量时, 不可缺少时间维度"); - } for (Measure measure : measures) { String measureForbiddenCharacters = NameCheckUtils.findForbiddenCharacters(measure.getName()); if (StringUtils.isNotBlank(measure.getName()) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java index 4f5c641ef..ab309e1f4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java @@ -155,8 +155,7 @@ public class ModelConverter { private static boolean isCreateDimension(Dim dim) { return dim.getIsCreateDimension() == 1 - && StringUtils.isNotBlank(dim.getName()) - && !dim.getType().equalsIgnoreCase(DimensionType.time.name()); + && StringUtils.isNotBlank(dim.getName()); } private static boolean isCreateDimension(Identify identify) {