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

(improvement)(Headless) fix tag list filter by status (#869)

Browse Source 
Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-03-29 18:28:23 +08:00
committed by GitHub
parent 1ab88360ac
commit 3dcbdb28ad
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java
View File

@@ -27,7 +27,7 @@ public class MetaFilter {
private Integer sensitiveLevel; private Integer sensitiveLevel;
private List<Integer> status; private Integer status;
private String key; private String key;

6
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java
View File

@@ -109,8 +109,8 @@ public class DataSetServiceImpl
if (!CollectionUtils.isEmpty(metaFilter.getIds())) { if (!CollectionUtils.isEmpty(metaFilter.getIds())) {
wrapper.lambda().in(DataSetDO::getId, metaFilter.getIds()); wrapper.lambda().in(DataSetDO::getId, metaFilter.getIds());
} }
if (!CollectionUtils.isEmpty(metaFilter.getStatus())) { if (metaFilter.getStatus() != null) {
wrapper.lambda().in(DataSetDO::getStatus, metaFilter.getStatus()); wrapper.lambda().eq(DataSetDO::getStatus, metaFilter.getStatus());
} }
wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode()); wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode());
return list(wrapper).stream().map(entry -> convert(entry, user)).collect(Collectors.toList()); return list(wrapper).stream().map(entry -> convert(entry, user)).collect(Collectors.toList());
@@ -212,7 +212,7 @@ public class DataSetServiceImpl
@Override @Override
public Map<Long, List<Long>> getModelIdToDataSetIds(List<Long> dataSetIds, User user) { public Map<Long, List<Long>> getModelIdToDataSetIds(List<Long> dataSetIds, User user) {
MetaFilter metaFilter = new MetaFilter(); MetaFilter metaFilter = new MetaFilter();
metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); metaFilter.setStatus(StatusEnum.ONLINE.getCode());
metaFilter.setIds(dataSetIds); metaFilter.setIds(dataSetIds);
List<DataSetResp> dataSetList = dataSetSchemaCache.getIfPresent(metaFilter); List<DataSetResp> dataSetList = dataSetSchemaCache.getIfPresent(metaFilter);
if (CollectionUtils.isEmpty(dataSetList)) { if (CollectionUtils.isEmpty(dataSetList)) {

4
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java
View File

@@ -160,7 +160,7 @@ public class SchemaServiceImpl implements SchemaService {
public List<DataSetSchemaResp> buildDataSetSchema(DataSetFilterReq filter) { public List<DataSetSchemaResp> buildDataSetSchema(DataSetFilterReq filter) {
MetaFilter metaFilter = new MetaFilter(); MetaFilter metaFilter = new MetaFilter();
metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); metaFilter.setStatus(StatusEnum.ONLINE.getCode());
metaFilter.setIds(filter.getDataSetIds()); metaFilter.setIds(filter.getDataSetIds());
List<DataSetResp> dataSetResps = dataSetService.getDataSetList(metaFilter, User.getFakeUser()); List<DataSetResp> dataSetResps = dataSetService.getDataSetList(metaFilter, User.getFakeUser());
Map<Long, DataSetResp> dataSetRespMap = getDataSetMap(dataSetResps); Map<Long, DataSetResp> dataSetRespMap = getDataSetMap(dataSetResps);
@@ -210,7 +210,7 @@ public class SchemaServiceImpl implements SchemaService {
return modelSchemaResps; return modelSchemaResps;
} }
MetaFilter metaFilter = new MetaFilter(modelIds); MetaFilter metaFilter = new MetaFilter(modelIds);
metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); metaFilter.setStatus(StatusEnum.ONLINE.getCode());
Map<Long, List<MetricResp>> metricRespMap = metricService.getMetrics(metaFilter) Map<Long, List<MetricResp>> metricRespMap = metricService.getMetrics(metaFilter)
.stream().collect(Collectors.groupingBy(MetricResp::getModelId)); .stream().collect(Collectors.groupingBy(MetricResp::getModelId));
Map<Long, List<DimensionResp>> dimensionRespsMap = dimensionService.getDimensions(metaFilter) Map<Long, List<DimensionResp>> dimensionRespsMap = dimensionService.getDimensions(metaFilter)

8
headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
View File

@@ -143,12 +143,8 @@
<if test="sensitiveLevel != null"> <if test="sensitiveLevel != null">
and t.sensitive_level = #{sensitiveLevel} and t.sensitive_level = #{sensitiveLevel}
</if> </if>
<if test="status != null and status.size >0"> <if test="status != null">
and t.status in and t.status = #{status}
<foreach collection="status" index="index" item="status" open="(" close=")"
separator=",">
#{status}
</foreach>
</if> </if>
<if test="modelIds != null and modelIds.size >0"> <if test="modelIds != null and modelIds.size >0">
and t.model_id in and t.model_id in

8
headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml
View File

@@ -150,12 +150,8 @@
<if test="sensitiveLevel != null"> <if test="sensitiveLevel != null">
and t.sensitive_level = #{sensitiveLevel} and t.sensitive_level = #{sensitiveLevel}
</if> </if>
<if test="status != null and status.size >0"> <if test="status != null">
and t.status in and t.status = #{status}
<foreach collection="status" index="index" item="status" open="(" close=")"
separator=",">
#{status}
</foreach>
</if> </if>
<if test="modelIds != null and modelIds.size >0"> <if test="modelIds != null and modelIds.size >0">
and t.model_id in and t.model_id in