topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-13 04:57:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement][chat] In the search interface, modelId and modelName are changed to dataSetId and dataSetName (#1855)

Browse Source
This commit is contained in:
lexluo09
2024-10-29 16:01:02 +08:00
committed by GitHub
parent eaf1cd2790
commit 0383683ac0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SearchResult.java
View File

@@ -18,9 +18,9 @@ public class SearchResult {
private String subRecommend; private String subRecommend;
private String modelName; private Long dataSetId;
private Long modelId; private String dataSetName;
private SchemaElementType schemaElementType; private SchemaElementType schemaElementType;
@@ -36,11 +36,11 @@ public class SearchResult {
} }
SearchResult searchResult1 = (SearchResult) o; SearchResult searchResult1 = (SearchResult) o;
return Objects.equals(recommend, searchResult1.recommend) return Objects.equals(recommend, searchResult1.recommend)
&& Objects.equals(modelName, searchResult1.modelName); && Objects.equals(dataSetName, searchResult1.dataSetName);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(recommend, modelName); return Objects.hash(recommend, dataSetName);
} }
} }

7
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
View File

@@ -181,7 +181,8 @@ public class RetrieveServiceImpl implements RetrieveService {
private SearchResult createBaseSearchResult(Long dataSetId, Map<Long, String> dataSetIdToName, private SearchResult createBaseSearchResult(Long dataSetId, Map<Long, String> dataSetIdToName,
MatchText matchText, String wordName, SchemaElementType schemaElementType) { MatchText matchText, String wordName, SchemaElementType schemaElementType) {
return SearchResult.builder().modelId(dataSetId).modelName(dataSetIdToName.get(dataSetId)) return SearchResult.builder().dataSetId(dataSetId)
.dataSetName(dataSetIdToName.get(dataSetId))
.recommend(matchText.getRegText() + wordName).schemaElementType(schemaElementType) .recommend(matchText.getRegText() + wordName).schemaElementType(schemaElementType)
.subRecommend(wordName).build(); .subRecommend(wordName).build();
} }
@@ -206,7 +207,7 @@ public class RetrieveServiceImpl implements RetrieveService {
private SearchResult createMetricSearchResult(Long modelId, Map<Long, String> modelToName, private SearchResult createMetricSearchResult(Long modelId, Map<Long, String> modelToName,
MatchText matchText, String wordName, String metric) { MatchText matchText, String wordName, String metric) {
return SearchResult.builder().modelId(modelId).modelName(modelToName.get(modelId)) return SearchResult.builder().dataSetId(modelId).dataSetName(modelToName.get(modelId))
.recommend(matchText.getRegText() + wordName + DictWordType.SPACE + metric) .recommend(matchText.getRegText() + wordName + DictWordType.SPACE + metric)
.subRecommend(wordName + DictWordType.SPACE + metric).isComplete(false).build(); .subRecommend(wordName + DictWordType.SPACE + metric).isComplete(false).build();
} }
@@ -281,7 +282,7 @@ public class RetrieveServiceImpl implements RetrieveService {
String subRecommendText = hanlpMapResult.getName(); String subRecommendText = hanlpMapResult.getName();
SearchResult searchResult = SearchResult searchResult =
SearchResult.builder().modelId(dataSetId).modelName(modelName) SearchResult.builder().dataSetId(dataSetId).dataSetName(modelName)
.recommend(recommendText).subRecommend(subRecommendText) .recommend(recommendText).subRecommend(subRecommendText)
.schemaElementType(schemaElementType).build(); .schemaElementType(schemaElementType).build();