topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-11 03:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(headless) metric list support filter by hasCollect (#613)

Browse Source 
Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-01-10 14:12:39 +08:00
committed by GitHub
parent 61da52650c
commit 9c8039c499
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java
View File

@@ -18,4 +18,5 @@ public class PageSchemaItemReq extends PageBaseReq {
private Integer status; private Integer status;
private String key; private String key;
private List<Long> ids; private List<Long> ids;
private boolean hasCollect;
} }

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

@@ -182,14 +182,17 @@ public class MetricServiceImpl implements MetricService {
List<Long> modelIds = modelResps.stream().map(ModelResp::getId).collect(Collectors.toList()); List<Long> modelIds = modelResps.stream().map(ModelResp::getId).collect(Collectors.toList());
pageMetricReq.getModelIds().addAll(modelIds); pageMetricReq.getModelIds().addAll(modelIds);
metricFilter.setModelIds(pageMetricReq.getModelIds()); metricFilter.setModelIds(pageMetricReq.getModelIds());
List<CollectDO> collectList = collectService.getCollectList(user.getName());
List<Long> collectIds = collectList.stream().map(CollectDO::getCollectId).collect(Collectors.toList());
if (pageMetricReq.isHasCollect()) {
metricFilter.setIds(collectIds);
}
PageInfo<MetricDO> metricDOPageInfo = PageHelper.startPage(pageMetricReq.getCurrent(), PageInfo<MetricDO> metricDOPageInfo = PageHelper.startPage(pageMetricReq.getCurrent(),
pageMetricReq.getPageSize()) pageMetricReq.getPageSize())
.doSelectPageInfo(() -> queryMetric(metricFilter)); .doSelectPageInfo(() -> queryMetric(metricFilter));
PageInfo<MetricResp> pageInfo = new PageInfo<>(); PageInfo<MetricResp> pageInfo = new PageInfo<>();
BeanUtils.copyProperties(metricDOPageInfo, pageInfo); BeanUtils.copyProperties(metricDOPageInfo, pageInfo);
List<CollectDO> collectList = collectService.getCollectList(user.getName()); List<MetricResp> metricResps = convertList(metricDOPageInfo.getList(), collectIds);
List<Long> collect = collectList.stream().map(CollectDO::getCollectId).collect(Collectors.toList());
List<MetricResp> metricResps = convertList(metricDOPageInfo.getList(), collect);
fillAdminRes(metricResps, user); fillAdminRes(metricResps, user);
pageInfo.setList(metricResps); pageInfo.setList(metricResps);
return pageInfo; return pageInfo;