diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java index 1a8f7746b..b96a26389 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java @@ -13,6 +13,7 @@ public class QueryResp { private Long questionId; private Date createTime; private Long chatId; + private Integer agentId; private Integer score; private String feedback; private String queryText; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index 0cf50d53b..f45de8b92 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -475,40 +475,39 @@ public class DimensionServiceImpl extends ServiceImpl DimValueMap) Map existingMap = dimValueMapList.stream() .collect(Collectors.toMap(DimValueMap::getValue, v -> v, (v1, v2) -> v2)); - + // 收集需要删除的 values(alias 为空的) Set valuesToDelete = req.getDimValueMaps().stream() .filter(dimValueMap -> CollectionUtils.isEmpty(dimValueMap.getAlias())) - .map(DimValueMap::getValue) - .collect(Collectors.toSet()); - + .map(DimValueMap::getValue).collect(Collectors.toSet()); + // 一次性删除所有需要删除的数据 if (!valuesToDelete.isEmpty()) { - dimValueMapList = dimValueMapList.stream() - .filter(map -> !valuesToDelete.contains(map.getValue())) - .collect(Collectors.toList()); + dimValueMapList = + dimValueMapList.stream().filter(map -> !valuesToDelete.contains(map.getValue())) + .collect(Collectors.toList()); // 同时从 existingMap 中移除 existingMap.keySet().removeAll(valuesToDelete); } - + // 处理新增和更新 for (DimValueMap dimValueMap : req.getDimValueMaps()) { // 跳过需要删除的 if (CollectionUtils.isEmpty(dimValueMap.getAlias())) { continue; } - + String value = dimValueMap.getValue(); if (!existingMap.containsKey(value)) { // 新增 @@ -520,7 +519,7 @@ public class DimensionServiceImpl extends ServiceImpl getDomainDataSetTree() { List domainResps = domainService.getDomainList(); List itemResps = domainResps.stream().map(domain -> new ItemResp(domain.getId(), - domain.getParentId(), domain.getName(), TypeEnums.DOMAIN)) - .toList(); + domain.getParentId(), domain.getName(), TypeEnums.DOMAIN)).toList(); Map itemRespMap = itemResps.stream().collect(Collectors.toMap(ItemResp::getId, item -> item)); - List dataSetResps = dataSetService.getDataSetList(MetaFilter.builder() - .status(StatusEnum.ONLINE.getCode()) - .build()); + List dataSetResps = dataSetService + .getDataSetList(MetaFilter.builder().status(StatusEnum.ONLINE.getCode()).build()); for (DataSetResp dataSetResp : dataSetResps) { ItemResp itemResp = itemRespMap.get(dataSetResp.getDomainId()); if (itemResp != null) {