From 61da52650c49ea1f8181a02ebc7018af875c6905 Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Wed, 10 Jan 2024 10:13:45 +0800 Subject: [PATCH] (improvement)(headless) Supplement the model name when obtaining metric information (#612) Co-authored-by: jolunoluo --- .../server/service/impl/HeadlessQueryEngineImpl.java | 7 ++++--- .../headless/server/service/impl/MetricServiceImpl.java | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java index 4f14be034..128b2ccfd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java @@ -99,10 +99,11 @@ public class HeadlessQueryEngineImpl implements HeadlessQueryEngine { } private HeadlessModel getHeadLessModel(QueryStatement queryStatement) throws Exception { - HeadlessModel headlessModel = headlessSchemaManager.get(queryStatement.getQueryStructReq().getModelIdStr()); - ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStatement.getQueryStructReq()); + QueryStructReq queryStructReq = queryStatement.getQueryStructReq(); + HeadlessModel headlessModel = headlessSchemaManager.get(queryStructReq.getModelIdStr()); + ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStructReq); headlessModel.setDataDate(itemDateResp); - List modelSchemaResps = catalog.getModelSchema(queryStatement.getModelIds()); + List modelSchemaResps = catalog.getModelSchema(queryStructReq.getModelIds()); headlessModel.setModelSchemaResps(modelSchemaResps); return headlessModel; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 738c9a14d..47db9df09 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -235,10 +235,14 @@ public class MetricServiceImpl implements MetricService { @Override public MetricResp getMetric(Long id, User user) { - MetricResp metricResp = getMetric(id); - if (metricResp == null) { + MetricDO metricDO = metricRepository.getMetricById(id); + if (metricDO == null) { return null; } + Map modelMap = modelService.getModelMap(); + List collectList = collectService.getCollectList(user.getName()); + List collect = collectList.stream().map(CollectDO::getCollectId).collect(Collectors.toList()); + MetricResp metricResp = MetricConverter.convert2MetricResp(metricDO, modelMap, collect); fillAdminRes(Lists.newArrayList(metricResp), user); return metricResp; }