diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java index b86dd0ebb..4603734ae 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java @@ -27,7 +27,7 @@ public class MetaFilter { private Integer sensitiveLevel; - private List status; + private Integer status; private String key; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java index e84022998..d6ae40ed3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java @@ -109,8 +109,8 @@ public class DataSetServiceImpl if (!CollectionUtils.isEmpty(metaFilter.getIds())) { wrapper.lambda().in(DataSetDO::getId, metaFilter.getIds()); } - if (!CollectionUtils.isEmpty(metaFilter.getStatus())) { - wrapper.lambda().in(DataSetDO::getStatus, metaFilter.getStatus()); + if (metaFilter.getStatus() != null) { + wrapper.lambda().eq(DataSetDO::getStatus, metaFilter.getStatus()); } wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode()); return list(wrapper).stream().map(entry -> convert(entry, user)).collect(Collectors.toList()); @@ -212,7 +212,7 @@ public class DataSetServiceImpl @Override public Map> getModelIdToDataSetIds(List dataSetIds, User user) { MetaFilter metaFilter = new MetaFilter(); - metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); + metaFilter.setStatus(StatusEnum.ONLINE.getCode()); metaFilter.setIds(dataSetIds); List dataSetList = dataSetSchemaCache.getIfPresent(metaFilter); if (CollectionUtils.isEmpty(dataSetList)) { diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java index 463bb28fb..3a8296f45 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java @@ -160,7 +160,7 @@ public class SchemaServiceImpl implements SchemaService { public List buildDataSetSchema(DataSetFilterReq filter) { MetaFilter metaFilter = new MetaFilter(); - metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); + metaFilter.setStatus(StatusEnum.ONLINE.getCode()); metaFilter.setIds(filter.getDataSetIds()); List dataSetResps = dataSetService.getDataSetList(metaFilter, User.getFakeUser()); Map dataSetRespMap = getDataSetMap(dataSetResps); @@ -210,7 +210,7 @@ public class SchemaServiceImpl implements SchemaService { return modelSchemaResps; } MetaFilter metaFilter = new MetaFilter(modelIds); - metaFilter.setStatus(Lists.newArrayList(StatusEnum.ONLINE.getCode())); + metaFilter.setStatus(StatusEnum.ONLINE.getCode()); Map> metricRespMap = metricService.getMetrics(metaFilter) .stream().collect(Collectors.groupingBy(MetricResp::getModelId)); Map> dimensionRespsMap = dimensionService.getDimensions(metaFilter) diff --git a/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml b/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml index c0af37429..95b9f734d 100644 --- a/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml @@ -143,12 +143,8 @@ and t.sensitive_level = #{sensitiveLevel} - - and t.status in - - #{status} - + + and t.status = #{status} and t.model_id in diff --git a/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml b/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml index 312ef93ee..e186a24bb 100644 --- a/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml @@ -150,12 +150,8 @@ and t.sensitive_level = #{sensitiveLevel} - - and t.status in - - #{status} - + + and t.status = #{status} and t.model_id in