From 66ad18f4d3f75398aa135dea123e0a902b6523a6 Mon Sep 17 00:00:00 2001 From: wangyong <48429126+wangyong00@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:37:11 +0800 Subject: [PATCH 1/2] fixed bug 2281 --- .../headless/server/rest/DataSetController.java | 7 +++---- .../headless/server/service/DataSetService.java | 2 ++ .../server/service/impl/DataSetServiceImpl.java | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java index 796cef2e0..1c6263f36 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; @RestController @@ -50,10 +51,8 @@ public class DataSetController { @GetMapping("/getDataSetList") public List getDataSetList(@RequestParam("domainId") Long domainId) { - MetaFilter metaFilter = new MetaFilter(); - metaFilter.setDomainId(domainId); - metaFilter.setStatus(StatusEnum.ONLINE.getCode()); - return dataSetService.getDataSetList(metaFilter); + List statuCodeList = Arrays.asList(StatusEnum.ONLINE.getCode(),StatusEnum.OFFLINE.getCode()); + return dataSetService.getDataSetList(domainId,statuCodeList); } @DeleteMapping("/{id}") diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java index f1c5cec85..2bb87505e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java @@ -20,6 +20,8 @@ public interface DataSetService { List getDataSetList(MetaFilter metaFilter); + List getDataSetList(Long domainId ,List statuCodesList); + void delete(Long id, User user); Map> getModelIdToDataSetIds(List dataSetIds, User user); 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 9c1fee36e..e7f4c97ce 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 @@ -102,6 +102,20 @@ public class DataSetServiceImpl extends ServiceImpl return list(wrapper).stream().map(this::convert).collect(Collectors.toList()); } + @Override + public List getDataSetList(Long domainId, List statuCodesList) { + if(domainId==null || CollectionUtils.isEmpty(statuCodesList)){ + return List.of(); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(DataSetDO::getDomainId, domainId); + wrapper.lambda().in(DataSetDO::getStatus, statuCodesList); + wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode()); + + return list(wrapper).stream().map(this::convert).collect(Collectors.toList()); + + } + @Override public void delete(Long id, User user) { DataSetDO dataSetDO = getById(id); From b80db694c5e0dae4f1e9f871e62a4c4a2d45ebde Mon Sep 17 00:00:00 2001 From: wangyong97 Date: Thu, 3 Jul 2025 20:30:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?(fix)(headless)=20BaseMapper.getMatches,?= =?UTF-8?q?=E7=A9=BAMap=E6=8F=90=E5=89=8D=E8=BF=94=E5=9B=9Ematches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/supersonic/headless/chat/mapper/BaseMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java index 8b177a963..9bef4a421 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java @@ -129,7 +129,7 @@ public abstract class BaseMapper implements SchemaMapper { Map> matchResult = matchStrategy.match(chatQueryContext, terms, chatQueryContext.getRequest().getDataSetIds()); List matches = new ArrayList<>(); - if (Objects.isNull(matchResult)) { + if (Objects.isNull(matchResult) || matchResult.isEmpty()) { return matches; } Optional> first = matchResult.entrySet().stream()