mirror of
https://github.com/tencentmusic/supersonic.git
synced 2026-04-19 21:14:25 +08:00
Compare commits
2 Commits
4ab9cd715d
...
be2e380b4c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be2e380b4c | ||
|
|
eeaebe06aa |
@@ -17,6 +17,7 @@ import com.tencent.supersonic.chat.server.persistence.mapper.ChatParseMapper;
|
||||
import com.tencent.supersonic.chat.server.persistence.mapper.ChatQueryDOMapper;
|
||||
import com.tencent.supersonic.chat.server.persistence.mapper.custom.ShowCaseCustomMapper;
|
||||
import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository;
|
||||
import com.tencent.supersonic.common.pojo.QueryColumn;
|
||||
import com.tencent.supersonic.common.util.JsonUtil;
|
||||
import com.tencent.supersonic.common.util.PageUtils;
|
||||
import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
|
||||
@@ -116,6 +117,20 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
JsonUtil.toObject(chatQueryDO.getQueryResult(), QueryResult.class);
|
||||
if (queryResult != null) {
|
||||
queryResult.setQueryId(chatQueryDO.getQuestionId());
|
||||
// fix bugs, compatible with bugs caused by history field changes
|
||||
if (!CollectionUtils.isEmpty(queryResult.getQueryColumns())) {
|
||||
List<QueryColumn> queryColumns = queryResult.getQueryColumns().stream().peek(x -> {
|
||||
if (StringUtils.isEmpty(x.getBizName())
|
||||
&& StringUtils.isNotEmpty(x.getNameEn())) {
|
||||
x.setBizName(x.getNameEn());
|
||||
}
|
||||
if (StringUtils.isNotEmpty(x.getBizName())
|
||||
&& StringUtils.isEmpty(x.getNameEn())) {
|
||||
x.setNameEn(x.getBizName());
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
queryResult.setQueryColumns(queryColumns);
|
||||
}
|
||||
queryResp.setQueryResult(queryResult);
|
||||
}
|
||||
queryResp.setSimilarQueries(JSONObject.parseArray(chatQueryDO.getSimilarQueries(),
|
||||
|
||||
@@ -26,7 +26,8 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
|
||||
try {
|
||||
String s2SQL = semanticParseInfo.getSqlInfo().getCorrectedS2SQL();
|
||||
if (Objects.isNull(s2SQL)) {
|
||||
semanticParseInfo.getSqlInfo().setCorrectedS2SQL(semanticParseInfo.getSqlInfo().getParsedS2SQL());
|
||||
semanticParseInfo.getSqlInfo()
|
||||
.setCorrectedS2SQL(semanticParseInfo.getSqlInfo().getParsedS2SQL());
|
||||
}
|
||||
doCorrect(chatQueryContext, semanticParseInfo);
|
||||
log.debug("sqlCorrection:{} sql:{}", this.getClass().getSimpleName(),
|
||||
|
||||
@@ -37,7 +37,7 @@ public class MetricConverter {
|
||||
metricDO.setClassifications(metricReq.getClassifications());
|
||||
metricDO.setRelateDimensions(JSONObject.toJSONString(metricReq.getRelateDimension()));
|
||||
metricDO.setStatus(StatusEnum.ONLINE.getCode());
|
||||
metricDO.setIsPublish(PublishEnum.UN_PUBLISHED.getCode());
|
||||
metricDO.setIsPublish(PublishEnum.PUBLISHED.getCode());
|
||||
if (metricReq.getExt() != null) {
|
||||
metricDO.setExt(JSONObject.toJSONString(metricReq.getExt()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user