(improvement)(headless) Supplement the model name when obtaining metric information (#612)

Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-01-10 10:13:45 +08:00
committed by GitHub
parent 87a60eeba2
commit 61da52650c
2 changed files with 10 additions and 5 deletions

View File

@@ -99,10 +99,11 @@ public class HeadlessQueryEngineImpl implements HeadlessQueryEngine {
} }
private HeadlessModel getHeadLessModel(QueryStatement queryStatement) throws Exception { private HeadlessModel getHeadLessModel(QueryStatement queryStatement) throws Exception {
HeadlessModel headlessModel = headlessSchemaManager.get(queryStatement.getQueryStructReq().getModelIdStr()); QueryStructReq queryStructReq = queryStatement.getQueryStructReq();
ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStatement.getQueryStructReq()); HeadlessModel headlessModel = headlessSchemaManager.get(queryStructReq.getModelIdStr());
ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStructReq);
headlessModel.setDataDate(itemDateResp); headlessModel.setDataDate(itemDateResp);
List<ModelSchemaResp> modelSchemaResps = catalog.getModelSchema(queryStatement.getModelIds()); List<ModelSchemaResp> modelSchemaResps = catalog.getModelSchema(queryStructReq.getModelIds());
headlessModel.setModelSchemaResps(modelSchemaResps); headlessModel.setModelSchemaResps(modelSchemaResps);
return headlessModel; return headlessModel;
} }

View File

@@ -235,10 +235,14 @@ public class MetricServiceImpl implements MetricService {
@Override @Override
public MetricResp getMetric(Long id, User user) { public MetricResp getMetric(Long id, User user) {
MetricResp metricResp = getMetric(id); MetricDO metricDO = metricRepository.getMetricById(id);
if (metricResp == null) { if (metricDO == null) {
return null; return null;
} }
Map<Long, ModelResp> modelMap = modelService.getModelMap();
List<CollectDO> collectList = collectService.getCollectList(user.getName());
List<Long> collect = collectList.stream().map(CollectDO::getCollectId).collect(Collectors.toList());
MetricResp metricResp = MetricConverter.convert2MetricResp(metricDO, modelMap, collect);
fillAdminRes(Lists.newArrayList(metricResp), user); fillAdminRes(Lists.newArrayList(metricResp), user);
return metricResp; return metricResp;
} }