(improvement)(chat) Add DrillDownDimensionProcessor and SimilarQueryProcessor to obtain recommended dimensions and similar queries (#511)

Co-authored-by: jolunoluo

auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authorization.application;
+package com.tencent.supersonic.auth.authorization.service;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class SolvedQueryReq {
+public class SimilarQueryReq {
 
     private Long queryId;
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryRecallResp.java

@@ -6,6 +6,6 @@ import java.util.List;
 
 @Data
 public class QueryRecallResp {
-    private List<SolvedQueryRecallResp> solvedQueryRecallRespList;
+    private List<SimilarQueryRecallResp> solvedQueryRecallRespList;
     private Long queryTimeCost;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java

@@ -1,9 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import java.util.Date;
-import java.util.List;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import lombok.Data;
+import java.util.Date;
+import java.util.List;
 
 @Data
 public class QueryResp {
@@ -16,4 +16,5 @@ public class QueryResp {
     private String queryText;
     private QueryResult queryResult;
     private List<SemanticParseInfo> parseInfos;
+    private List<SimilarQueryRecallResp> similarQueries;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java

@@ -1,11 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import lombok.Data;
 import java.util.List;
 import java.util.Map;
-import lombok.Data;
 
 @Data
 public class QueryResult {
@@ -22,4 +23,5 @@ public class QueryResult {
     private Object response;
     private List<Map<String, Object>> queryResults;
     private Long queryTimeCost;
+    private List<SchemaElement> recommendedDimensions;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @Data
 @Builder
-public class SolvedQueryRecallResp {
+public class SimilarQueryRecallResp {
 
     private Long queryId;
 

chat/core/src/main/java/com/tencent/supersonic/chat/persistence/dataobject/ChatQueryDO.java

@@ -1,7 +1,9 @@
 package com.tencent.supersonic.chat.persistence.dataobject;
 
+import lombok.Data;
 import java.util.Date;
 
+@Data
 public class ChatQueryDO {
     /**
      */
@@ -43,155 +45,6 @@ public class ChatQueryDO {
      */
     private String queryResult;
 
-    /**
+    private String similarQueries;
-     * @return question_id
-     */
-    public Long getQuestionId() {
-        return questionId;
-    }
 
-    /**
-     * @param questionId
-     */
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-
-    /**
-     * @return agent_id
-     */
-    public Integer getAgentId() {
-        return agentId;
-    }
-
-    /**
-     * @param agentId
-     */
-    public void setAgentId(Integer agentId) {
-        this.agentId = agentId;
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return user_name
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    /**
-     * @param userName
-     */
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-    /**
-     *
-     * @return query_state
-     */
-    public Integer getQueryState() {
-        return queryState;
-    }
-
-    /**
-     *
-     * @param queryState
-     */
-    public void setQueryState(Integer queryState) {
-        this.queryState = queryState;
-    }
-
-    /**
-     *
-     * @return chat_id
-     */
-    public Long getChatId() {
-        return chatId;
-    }
-
-    /**
-     *
-     * @param chatId
-     */
-    public void setChatId(Long chatId) {
-        this.chatId = chatId;
-    }
-
-    /**
-     *
-     * @return score
-     */
-    public Integer getScore() {
-        return score;
-    }
-
-    /**
-     *
-     * @param score
-     */
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    /**
-     *
-     * @return feedback
-     */
-    public String getFeedback() {
-        return feedback;
-    }
-
-    /**
-     *
-     * @param feedback
-     */
-    public void setFeedback(String feedback) {
-        this.feedback = feedback == null ? null : feedback.trim();
-    }
-
-    /**
-     *
-     * @return query_text
-     */
-    public String getQueryText() {
-        return queryText;
-    }
-
-    /**
-     *
-     * @param queryText
-     */
-    public void setQueryText(String queryText) {
-        this.queryText = queryText == null ? null : queryText.trim();
-    }
-
-    /**
-     *
-     * @return query_result
-     */
-    public String getQueryResult() {
-        return queryResult;
-    }
-
-    /**
-     *
-     * @param queryResult
-     */
-    public void setQueryResult(String queryResult) {
-        this.queryResult = queryResult == null ? null : queryResult.trim();
-    }
 }

chat/core/src/main/java/com/tencent/supersonic/chat/persistence/mapper/ChatQueryDOMapper.java

@@ -16,4 +16,6 @@ public interface ChatQueryDOMapper {
     int updateByPrimaryKeyWithBLOBs(ChatQueryDO record);
 
     Boolean deleteByPrimaryKey(Long questionId);
+
+    ChatQueryDO selectByPrimaryKey(Long questionId);
 }

chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/ChatQueryRepository.java

@@ -3,13 +3,12 @@ package com.tencent.supersonic.chat.persistence.repository;
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.chat.api.pojo.ChatContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;
 import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
-import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;
 
 import java.util.List;
 
@@ -17,9 +16,11 @@ public interface ChatQueryRepository {
 
     PageInfo<QueryResp> getChatQuery(PageQueryInfoReq pageQueryInfoCommend, Long chatId);
 
-    List<QueryResp> queryShowCase(PageQueryInfoReq pageQueryInfoCommend, int agentId);
+    QueryResp getChatQuery(Long queryId);
 
-    void createChatQuery(QueryResult queryResult, ChatContext chatCtx);
+    ChatQueryDO getChatQueryDO(Long queryId);
+
+    List<QueryResp> queryShowCase(PageQueryInfoReq pageQueryInfoCommend, int agentId);
 
     void updateChatParseInfo(List<ChatParseDO> chatParseDOS);
 
@@ -27,13 +28,11 @@ public interface ChatQueryRepository {
 
     int updateChatQuery(ChatQueryDO chatQueryDO);
 
-    Long createChatParse(ParseResp parseResult, ChatContext chatCtx, QueryReq queryReq);
-
     List<ChatParseDO> batchSaveParseInfo(ChatContext chatCtx, QueryReq queryReq,
                                ParseResp parseResult,
                                List<SemanticParseInfo> candidateParses);
 
-    public ChatParseDO getParseInfo(Long questionId, int parseId);
+    ChatParseDO getParseInfo(Long questionId, int parseId);
 
     List<ChatParseDO> getParseInfoList(List<Long> questionIds);
 

chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.chat.persistence.repository.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.chat.api.pojo.ChatContext;
@@ -9,6 +10,7 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDOExample;
@@ -28,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Repository
@@ -75,6 +78,20 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
         return chatQueryVOPageInfo;
     }
 
+    @Override
+    public QueryResp getChatQuery(Long queryId) {
+        ChatQueryDO chatQueryDO = getChatQueryDO(queryId);
+        if (Objects.isNull(chatQueryDO)) {
+            return new QueryResp();
+        }
+        return convertTo(chatQueryDO);
+    }
+
+    @Override
+    public ChatQueryDO getChatQueryDO(Long queryId) {
+        return chatQueryDOMapper.selectByPrimaryKey(queryId);
+    }
+
     @Override
     public List<QueryResp> queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId) {
         return showCaseCustomMapper.queryShowCase(pageQueryInfoReq.getLimitStart(),
@@ -84,33 +101,22 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
     }
 
     private QueryResp convertTo(ChatQueryDO chatQueryDO) {
-        QueryResp queryResponse = new QueryResp();
+        QueryResp queryResp = new QueryResp();
-        BeanUtils.copyProperties(chatQueryDO, queryResponse);
+        BeanUtils.copyProperties(chatQueryDO, queryResp);
         QueryResult queryResult = JsonUtil.toObject(chatQueryDO.getQueryResult(), QueryResult.class);
         if (queryResult != null) {
             queryResult.setQueryId(chatQueryDO.getQuestionId());
-            queryResponse.setQueryResult(queryResult);
+            queryResp.setQueryResult(queryResult);
         }
-        return queryResponse;
+        if (StringUtils.isNotBlank(chatQueryDO.getSimilarQueries())) {
+            List<SimilarQueryRecallResp> similarQueries = JSONObject.parseArray(chatQueryDO.getSimilarQueries(),
+                    SimilarQueryRecallResp.class);
+            queryResp.setSimilarQueries(similarQueries);
+        }
+        return queryResp;
     }
 
-    @Override
+    public Long createChatQuery(ParseResp parseResult, ChatContext chatCtx, QueryReq queryReq) {
-    public void createChatQuery(QueryResult queryResult, ChatContext chatCtx) {
-        ChatQueryDO chatQueryDO = new ChatQueryDO();
-        chatQueryDO.setChatId(Long.valueOf(chatCtx.getChatId()));
-        chatQueryDO.setCreateTime(new java.util.Date());
-        chatQueryDO.setUserName(chatCtx.getUser());
-        chatQueryDO.setQueryState(queryResult.getQueryState().ordinal());
-        chatQueryDO.setQueryText(chatCtx.getQueryText());
-        chatQueryDO.setQueryResult(JsonUtil.toString(queryResult));
-        chatQueryDO.setAgentId(chatCtx.getAgentId());
-        chatQueryDOMapper.insert(chatQueryDO);
-        ChatQueryDO lastChatQuery = getLastChatQuery(chatCtx.getChatId());
-        Long queryId = lastChatQuery.getQuestionId();
-        queryResult.setQueryId(queryId);
-    }
-
-    public Long createChatParse(ParseResp parseResult, ChatContext chatCtx, QueryReq queryReq) {
         ChatQueryDO chatQueryDO = new ChatQueryDO();
         chatQueryDO.setChatId(Long.valueOf(chatCtx.getChatId()));
         chatQueryDO.setCreateTime(new java.util.Date());
@@ -132,7 +138,7 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
     public List<ChatParseDO> batchSaveParseInfo(ChatContext chatCtx, QueryReq queryReq,
                                       ParseResp parseResult,
                                       List<SemanticParseInfo> candidateParses) {
-        Long queryId = createChatParse(parseResult, chatCtx, queryReq);
+        Long queryId = createChatQuery(parseResult, chatCtx, queryReq);
         List<ChatParseDO> chatParseDOList = new ArrayList<>();
         getChatParseDO(chatCtx, queryReq, queryId, candidateParses, chatParseDOList);
         chatParseMapper.batchSaveParseInfo(chatParseDOList);

chat/core/src/main/java/com/tencent/supersonic/chat/processor/execute/DimensionRecommendProcessor.java

@@ -0,0 +1,73 @@
+package com.tencent.supersonic.chat.processor.execute;
+
+import com.tencent.supersonic.chat.api.pojo.ModelSchema;
+import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement;
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import com.tencent.supersonic.chat.service.SemanticService;
+import com.tencent.supersonic.common.pojo.enums.QueryType;
+import com.tencent.supersonic.common.util.ContextUtils;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * DrillDownDimensionProcessor obtains metric recommended dimensions
+ */
+public class DimensionRecommendProcessor implements ExecuteResultProcessor {
+
+    private static final int recommend_dimension_size = 5;
+
+    @Override
+    public void process(QueryResult queryResult, SemanticParseInfo semanticParseInfo, ExecuteQueryReq queryReq) {
+        if (!QueryType.METRIC.equals(semanticParseInfo.getQueryType())
+                || CollectionUtils.isEmpty(semanticParseInfo.getMetrics())) {
+            return;
+        }
+        SchemaElement element = semanticParseInfo.getMetrics().iterator().next();
+        List<SchemaElement> dimensionRecommended = getDimensions(element.getId(), element.getModel());
+        queryResult.setRecommendedDimensions(dimensionRecommended);
+    }
+
+    private List<SchemaElement> getDimensions(Long metricId, Long modelId) {
+        SemanticService semanticService = ContextUtils.getBean(SemanticService.class);
+        ModelSchema modelSchema = semanticService.getModelSchema(modelId);
+        List<Long> drillDownDimensions = Lists.newArrayList();
+        Set<SchemaElement> metricElements = modelSchema.getMetrics();
+        if (!CollectionUtils.isEmpty(metricElements)) {
+            Optional<SchemaElement> metric = metricElements.stream().filter(schemaElement ->
+                            metricId.equals(schemaElement.getId())
+                                    && !CollectionUtils.isEmpty(schemaElement.getRelatedSchemaElements()))
+                    .findFirst();
+            if (metric.isPresent()) {
+                drillDownDimensions = metric.get().getRelatedSchemaElements().stream()
+                        .map(RelatedSchemaElement::getDimensionId).collect(Collectors.toList());
+            }
+        }
+        final List<Long> drillDownDimensionsFinal = drillDownDimensions;
+        return modelSchema.getDimensions().stream()
+                .filter(dim -> filterDimension(drillDownDimensionsFinal, dim))
+                .sorted(Comparator.comparing(SchemaElement::getUseCnt).reversed())
+                .limit(recommend_dimension_size)
+                .collect(Collectors.toList());
+    }
+
+    private boolean filterDimension(List<Long> drillDownDimensions, SchemaElement dimension) {
+        if (Objects.isNull(dimension)) {
+            return false;
+        }
+        if (!CollectionUtils.isEmpty(drillDownDimensions)) {
+            return drillDownDimensions.contains(dimension.getId());
+        }
+        return Objects.nonNull(dimension.getUseCnt());
+    }
+
+}

chat/core/src/main/java/com/tencent/supersonic/chat/processor/execute/DrillDownDimensionProcessor.java

@@ -0,0 +1,73 @@
+package com.tencent.supersonic.chat.processor.execute;
+
+import com.tencent.supersonic.chat.api.pojo.ModelSchema;
+import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement;
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import com.tencent.supersonic.chat.service.SemanticService;
+import com.tencent.supersonic.common.pojo.enums.QueryType;
+import com.tencent.supersonic.common.util.ContextUtils;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * DrillDownDimensionProcessor obtains metric recommended dimensions based on setting
+ */
+public class DrillDownDimensionProcessor implements ExecuteResultProcessor {
+
+    private static final int recommend_dimension_size = 5;
+
+    @Override
+    public void process(QueryResult queryResult, SemanticParseInfo semanticParseInfo, ExecuteQueryReq queryReq) {
+        if (!QueryType.METRIC.equals(semanticParseInfo.getQueryType())
+                || CollectionUtils.isEmpty(semanticParseInfo.getMetrics())) {
+            return;
+        }
+        SchemaElement element = semanticParseInfo.getMetrics().iterator().next();
+        List<SchemaElement> dimensionRecommend = getDimensions(element.getId(), element.getModel());
+        queryResult.setRecommendDimensions(dimensionRecommend);
+    }
+
+    private List<SchemaElement> getDimensions(Long metricId, Long modelId) {
+        SemanticService semanticService = ContextUtils.getBean(SemanticService.class);
+        ModelSchema modelSchema = semanticService.getModelSchema(modelId);
+        List<Long> drillDownDimensions = Lists.newArrayList();
+        Set<SchemaElement> metricElements = modelSchema.getMetrics();
+        if (!CollectionUtils.isEmpty(metricElements)) {
+            Optional<SchemaElement> metric = metricElements.stream().filter(schemaElement ->
+                            metricId.equals(schemaElement.getId())
+                                    && !CollectionUtils.isEmpty(schemaElement.getRelatedSchemaElements()))
+                    .findFirst();
+            if (metric.isPresent()) {
+                drillDownDimensions = metric.get().getRelatedSchemaElements().stream()
+                        .map(RelatedSchemaElement::getDimensionId).collect(Collectors.toList());
+            }
+        }
+        final List<Long> drillDownDimensionsFinal = drillDownDimensions;
+        return modelSchema.getDimensions().stream()
+                .filter(dim -> filterDimension(drillDownDimensionsFinal, dim))
+                .sorted(Comparator.comparing(SchemaElement::getUseCnt).reversed())
+                .limit(recommend_dimension_size)
+                .collect(Collectors.toList());
+    }
+
+    private boolean filterDimension(List<Long> drillDownDimensions, SchemaElement dimension) {
+        if (Objects.isNull(dimension)) {
+            return false;
+        }
+        if (!CollectionUtils.isEmpty(drillDownDimensions)) {
+            return drillDownDimensions.contains(dimension.getId());
+        }
+        return Objects.nonNull(dimension.getUseCnt());
+    }
+
+}

chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/SimilarQueryProcessor.java

@@ -0,0 +1,86 @@
+package com.tencent.supersonic.chat.processor.parse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
+import com.tencent.supersonic.chat.api.pojo.ChatContext;
+import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;
+import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
+import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO;
+import com.tencent.supersonic.chat.persistence.repository.ChatQueryRepository;
+import com.tencent.supersonic.chat.utils.SimilarQueryManager;
+import com.tencent.supersonic.common.util.ContextUtils;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class SimilarQueryProcessor implements ParseResultProcessor {
+
+    @Override
+    public void process(ParseResp parseResp, QueryContext queryContext, ChatContext chatContext) {
+        CompletableFuture.runAsync(() -> doProcess(parseResp, queryContext));
+    }
+
+    @SneakyThrows
+    private void doProcess(ParseResp parseResp, QueryContext queryContext) {
+        Long queryId = parseResp.getQueryId();
+        List<SimilarQueryRecallResp> solvedQueries = getSimilarQueries(queryContext.getRequest().getQueryText(),
+                queryContext.getRequest().getAgentId());
+        ChatQueryDO chatQueryDO = getChatQuery(queryId);
+        chatQueryDO.setSimilarQueries(JSONObject.toJSONString(solvedQueries));
+        updateChatQuery(chatQueryDO);
+    }
+
+    public List<SimilarQueryRecallResp> getSimilarQueries(String queryText, Integer agentId) {
+        //1. recall solved query by queryText
+        SimilarQueryManager solvedQueryManager = ContextUtils.getBean(SimilarQueryManager.class);
+        List<SimilarQueryRecallResp> similarQueries = solvedQueryManager.recallSimilarQuery(queryText, agentId);
+        if (CollectionUtils.isEmpty(similarQueries)) {
+            return Lists.newArrayList();
+        }
+        //2. remove low score query
+        List<Long> queryIds = similarQueries.stream()
+                .map(SimilarQueryRecallResp::getQueryId).collect(Collectors.toList());
+        int lowScoreThreshold = 3;
+        List<QueryResp> queryResps = getChatQuery(queryIds);
+        if (CollectionUtils.isEmpty(queryResps)) {
+            return Lists.newArrayList();
+        }
+        Set<Long> lowScoreQueryIds = queryResps.stream().filter(queryResp ->
+                        queryResp.getScore() != null && queryResp.getScore() <= lowScoreThreshold)
+                .map(QueryResp::getQuestionId).collect(Collectors.toSet());
+        return similarQueries.stream().filter(solvedQueryRecallResp ->
+                        !lowScoreQueryIds.contains(solvedQueryRecallResp.getQueryId()))
+                .collect(Collectors.toList());
+    }
+
+    private ChatQueryDO getChatQuery(Long queryId) {
+        ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class);
+        return chatQueryRepository.getChatQueryDO(queryId);
+    }
+
+    private List<QueryResp> getChatQuery(List<Long> queryIds) {
+        ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class);
+        PageQueryInfoReq pageQueryInfoReq = new PageQueryInfoReq();
+        pageQueryInfoReq.setIds(queryIds);
+        pageQueryInfoReq.setPageSize(100);
+        pageQueryInfoReq.setCurrent(1);
+        PageInfo<QueryResp> queryRespPageInfo = chatQueryRepository.getChatQuery(pageQueryInfoReq, null);
+        return queryRespPageInfo.getList();
+    }
+
+    private void updateChatQuery(ChatQueryDO chatQueryDO) {
+        ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class);
+        chatQueryRepository.updateChatQuery(chatQueryDO);
+    }
+
+}

chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatController.java

@@ -3,22 +3,23 @@ package com.tencent.supersonic.chat.rest;
 
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
-import com.tencent.supersonic.chat.api.pojo.response.QueryRecallResp;
-import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp;
-import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
-import com.tencent.supersonic.chat.persistence.dataobject.ChatDO;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;
+import com.tencent.supersonic.chat.api.pojo.response.QueryRecallResp;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
+import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
+import com.tencent.supersonic.chat.persistence.dataobject.ChatDO;
 import com.tencent.supersonic.chat.service.ChatService;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @RestController
 @RequestMapping({"/api/chat/manage", "/openapi/chat/manage"})
@@ -81,6 +82,11 @@ public class ChatController {
         return chatService.queryInfo(pageQueryInfoCommand, chatId);
     }
 
+    @GetMapping("/getChatQuery/{queryId}")
+    public QueryResp getChatQuery(@PathVariable("queryId") Long queryId) {
+        return chatService.getChatQuery(queryId);
+    }
+
     @PostMapping("/queryShowCase")
     public ShowCaseResp queryShowCase(@RequestBody PageQueryInfoReq pageQueryInfoCommand,
                                       @RequestParam(value = "agentId") int agentId) {
@@ -88,11 +94,11 @@ public class ChatController {
     }
 
     @RequestMapping("/getSolvedQuery")
-    public List<SolvedQueryRecallResp> getSolvedQuery(@RequestParam(value = "queryText") String queryText,
+    public List<SimilarQueryRecallResp> getSolvedQuery(@RequestParam(value = "queryText") String queryText,
-                                                      @RequestParam(value = "agentId") Integer agentId) {
+                                                       @RequestParam(value = "agentId") Integer agentId) {
         QueryRecallResp queryRecallResp = new QueryRecallResp();
         Long startTime = System.currentTimeMillis();
-        List<SolvedQueryRecallResp> solvedQueryRecallRespList = chatService.getSolvedQuery(queryText, agentId);
+        List<SimilarQueryRecallResp> solvedQueryRecallRespList = chatService.getSolvedQuery(queryText, agentId);
         queryRecallResp.setSolvedQueryRecallRespList(solvedQueryRecallRespList);
         queryRecallResp.setQueryTimeCost(System.currentTimeMillis() - startTime);
         return solvedQueryRecallRespList;

chat/core/src/main/java/com/tencent/supersonic/chat/service/ChatService.java

@@ -9,7 +9,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp;
-import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO;
@@ -29,8 +29,6 @@ public interface ChatService {
 
     void updateContext(ChatContext chatCtx);
 
-    void switchContext(ChatContext chatCtx);
-
     Boolean addChat(User user, String chatName, Integer agentId);
 
     List<ChatDO> getAll(String userName, Integer agentId);
@@ -45,14 +43,12 @@ public interface ChatService {
 
     PageInfo<QueryResp> queryInfo(PageQueryInfoReq pageQueryInfoCommend, long chatId);
 
+    QueryResp getChatQuery(Long queryId);
+
     ShowCaseResp queryShowCase(PageQueryInfoReq pageQueryInfoCommend, int agentId);
 
-    void addQuery(QueryResult queryResult, ChatContext chatCtx);
-
     List<ChatParseDO> batchAddParse(ChatContext chatCtx, QueryReq queryReq, ParseResp parseResult);
 
-    void updateChatParse(List<ChatParseDO> chatParseDOS);
-
     ChatQueryDO getLastQuery(long chatId);
 
     int updateQuery(ChatQueryDO chatQueryDO);
@@ -63,5 +59,5 @@ public interface ChatService {
 
     Boolean deleteChatQuery(Long questionId);
 
-    List<SolvedQueryRecallResp> getSolvedQuery(String queryText, Integer agentId);
+    List<SimilarQueryRecallResp> getSolvedQuery(String queryText, Integer agentId);
 }

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java

@@ -10,7 +10,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp;
-import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO;
 import com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO;
@@ -19,7 +19,7 @@ import com.tencent.supersonic.chat.persistence.repository.ChatContextRepository;
 import com.tencent.supersonic.chat.persistence.repository.ChatQueryRepository;
 import com.tencent.supersonic.chat.persistence.repository.ChatRepository;
 import com.tencent.supersonic.chat.service.ChatService;
-import com.tencent.supersonic.chat.utils.SolvedQueryManager;
+import com.tencent.supersonic.chat.utils.SimilarQueryManager;
 import com.tencent.supersonic.common.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
@@ -46,10 +46,10 @@ public class ChatServiceImpl implements ChatService {
     private ChatContextRepository chatContextRepository;
     private ChatRepository chatRepository;
     private ChatQueryRepository chatQueryRepository;
-    private SolvedQueryManager solvedQueryManager;
+    private SimilarQueryManager solvedQueryManager;
 
     public ChatServiceImpl(ChatContextRepository chatContextRepository, ChatRepository chatRepository,
-            ChatQueryRepository chatQueryRepository, SolvedQueryManager solvedQueryManager) {
+            ChatQueryRepository chatQueryRepository, SimilarQueryManager solvedQueryManager) {
         this.chatContextRepository = chatContextRepository;
         this.chatRepository = chatRepository;
         this.chatQueryRepository = chatQueryRepository;
@@ -83,12 +83,6 @@ public class ChatServiceImpl implements ChatService {
         chatContextRepository.updateContext(chatCtx);
     }
 
-    @Override
-    public void switchContext(ChatContext chatCtx) {
-        log.debug("switchContext ChatContext {}", chatCtx);
-        chatCtx.setParseInfo(new SemanticParseInfo());
-    }
-
     @Override
     public Boolean addChat(User user, String chatName, Integer agentId) {
         ChatDO chatDO = new ChatDO();
@@ -142,6 +136,11 @@ public class ChatServiceImpl implements ChatService {
         return queryRespPageInfo;
     }
 
+    @Override
+    public QueryResp getChatQuery(Long queryId) {
+        return chatQueryRepository.getChatQuery(queryId);
+    }
+
     @Override
     public ShowCaseResp queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId) {
         ShowCaseResp showCaseResp = new ShowCaseResp();
@@ -196,13 +195,6 @@ public class ChatServiceImpl implements ChatService {
         }
     }
 
-    @Override
-    public void addQuery(QueryResult queryResult, ChatContext chatCtx) {
-        chatQueryRepository.createChatQuery(queryResult, chatCtx);
-        chatRepository.updateLastQuestion(chatCtx.getChatId().longValue(),
-                chatCtx.getQueryText(), getCurrentTime());
-    }
-
     @Override
     public Boolean updateQuery(Long questionId, QueryResult queryResult, ChatContext chatCtx) {
         ChatQueryDO chatQueryDO = new ChatQueryDO();
@@ -226,11 +218,6 @@ public class ChatServiceImpl implements ChatService {
         return chatQueryRepository.batchSaveParseInfo(chatCtx, queryReq, parseResult, candidateParses);
     }
 
-    @Override
-    public void updateChatParse(List<ChatParseDO> chatParseDOS) {
-        chatQueryRepository.updateChatParseInfo(chatParseDOS);
-    }
-
     @Override
     public ChatQueryDO getLastQuery(long chatId) {
         return chatQueryRepository.getLastChatQuery(chatId);
@@ -250,14 +237,14 @@ public class ChatServiceImpl implements ChatService {
     }
 
     @Override
-    public List<SolvedQueryRecallResp> getSolvedQuery(String queryText, Integer agentId) {
+    public List<SimilarQueryRecallResp> getSolvedQuery(String queryText, Integer agentId) {
         //1. recall solved query by queryText
-        List<SolvedQueryRecallResp> solvedQueryRecallResps = solvedQueryManager.recallSolvedQuery(queryText, agentId);
+        List<SimilarQueryRecallResp> solvedQueryRecallResps = solvedQueryManager.recallSimilarQuery(queryText, agentId);
         if (CollectionUtils.isEmpty(solvedQueryRecallResps)) {
             return Lists.newArrayList();
         }
         List<Long> queryIds = solvedQueryRecallResps.stream()
-                .map(SolvedQueryRecallResp::getQueryId).collect(Collectors.toList());
+                .map(SimilarQueryRecallResp::getQueryId).collect(Collectors.toList());
         PageQueryInfoReq pageQueryInfoReq = new PageQueryInfoReq();
         pageQueryInfoReq.setIds(queryIds);
         pageQueryInfoReq.setPageSize(100);

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java

@@ -19,7 +19,7 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryDataReq;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
 import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.api.pojo.request.SolvedQueryReq;
+import com.tencent.supersonic.chat.api.pojo.request.SimilarQueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
 import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
@@ -39,7 +39,7 @@ import com.tencent.supersonic.chat.service.SemanticService;
 import com.tencent.supersonic.chat.service.StatisticsService;
 import com.tencent.supersonic.chat.service.TimeCost;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
-import com.tencent.supersonic.chat.utils.SolvedQueryManager;
+import com.tencent.supersonic.chat.utils.SimilarQueryManager;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
@@ -104,7 +104,7 @@ public class QueryServiceImpl implements QueryService {
     @Autowired
     private StatisticsService statisticsService;
     @Autowired
-    private SolvedQueryManager solvedQueryManager;
+    private SimilarQueryManager similarQueryManager;
 
     @Value("${time.threshold: 100}")
     private Integer timeThreshold;
@@ -240,7 +240,7 @@ public class QueryServiceImpl implements QueryService {
         if (queryResult.getResponse() == null && CollectionUtils.isEmpty(queryResult.getQueryResults())) {
             return;
         }
-        solvedQueryManager.saveSolvedQuery(SolvedQueryReq.builder().parseId(queryReq.getParseId())
+        similarQueryManager.saveSimilarQuery(SimilarQueryReq.builder().parseId(queryReq.getParseId())
                 .queryId(queryReq.getQueryId())
                 .agentId(chatQueryDO.getAgentId())
                 .modelId(parseInfo.getModelClusterKey())

chat/core/src/main/java/com/tencent/supersonic/chat/utils/SimilarQueryManager.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.chat.utils;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.api.pojo.request.SolvedQueryReq;
+import com.tencent.supersonic.chat.api.pojo.request.SimilarQueryReq;
-import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
+import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ComponentFactory;
 import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
@@ -10,13 +10,6 @@ import com.tencent.supersonic.common.util.embedding.Retrieval;
 import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
 import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
 import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -31,33 +24,41 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.net.URI;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
 @Slf4j
 @Component
-public class SolvedQueryManager {
+public class SimilarQueryManager {
 
     private EmbeddingConfig embeddingConfig;
 
     private S2EmbeddingStore s2EmbeddingStore = ComponentFactory.getS2EmbeddingStore();
 
 
-    public SolvedQueryManager(EmbeddingConfig embeddingConfig) {
+    public SimilarQueryManager(EmbeddingConfig embeddingConfig) {
         this.embeddingConfig = embeddingConfig;
     }
 
-    public void saveSolvedQuery(SolvedQueryReq solvedQueryReq) {
+    public void saveSimilarQuery(SimilarQueryReq similarQueryReq) {
         if (StringUtils.isBlank(embeddingConfig.getUrl())) {
             return;
         }
-        String queryText = solvedQueryReq.getQueryText();
+        String queryText = similarQueryReq.getQueryText();
         try {
-            String uniqueId = generateUniqueId(solvedQueryReq.getQueryId(), solvedQueryReq.getParseId());
+            String uniqueId = generateUniqueId(similarQueryReq.getQueryId(), similarQueryReq.getParseId());
             EmbeddingQuery embeddingQuery = new EmbeddingQuery();
             embeddingQuery.setQueryId(uniqueId);
             embeddingQuery.setQuery(queryText);
 
             Map<String, Object> metaData = new HashMap<>();
-            metaData.put("modelId", (solvedQueryReq.getModelId()));
+            metaData.put("modelId", (similarQueryReq.getModelId()));
-            metaData.put("agentId", solvedQueryReq.getAgentId());
+            metaData.put("agentId", similarQueryReq.getAgentId());
             embeddingQuery.setMetadata(metaData);
             String solvedQueryCollection = embeddingConfig.getSolvedQueryCollection();
             s2EmbeddingStore.addQuery(solvedQueryCollection, Lists.newArrayList(embeddingQuery));
@@ -66,11 +67,11 @@ public class SolvedQueryManager {
         }
     }
 
-    public List<SolvedQueryRecallResp> recallSolvedQuery(String queryText, Integer agentId) {
+    public List<SimilarQueryRecallResp> recallSimilarQuery(String queryText, Integer agentId) {
         if (StringUtils.isBlank(embeddingConfig.getUrl())) {
             return Lists.newArrayList();
         }
-        List<SolvedQueryRecallResp> solvedQueryRecallResps = Lists.newArrayList();
+        List<SimilarQueryRecallResp> similarQueryRecallResps = Lists.newArrayList();
         try {
             String solvedQueryCollection = embeddingConfig.getSolvedQueryCollection();
             int solvedQueryResultNum = embeddingConfig.getSolvedQueryResultNum();
@@ -97,11 +98,11 @@ public class SolvedQueryManager {
                             continue;
                         }
                         String id = retrieval.getId();
-                        SolvedQueryRecallResp solvedQueryRecallResp = SolvedQueryRecallResp.builder()
+                        SimilarQueryRecallResp similarQueryRecallResp = SimilarQueryRecallResp.builder()
                                 .queryText(retrieval.getQuery())
                                 .queryId(getQueryId(id)).parseId(getParseId(id))
                                 .build();
-                        solvedQueryRecallResps.add(solvedQueryRecallResp);
+                        similarQueryRecallResps.add(similarQueryRecallResp);
                         querySet.add(retrieval.getQuery());
                     }
                 }
@@ -110,7 +111,7 @@ public class SolvedQueryManager {
         } catch (Exception e) {
             log.warn("recall similar solved query failed, queryText:{}", queryText);
         }
-        return solvedQueryRecallResps;
+        return similarQueryRecallResps;
     }
 
     private String generateUniqueId(Long queryId, Integer parseId) {

chat/core/src/main/resources/mapper/ChatQueryDOMapper.xml

@@ -14,6 +14,7 @@
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO">
     <result column="query_text" jdbcType="LONGVARCHAR" property="queryText" />
     <result column="query_result" jdbcType="LONGVARCHAR" property="queryResult" />
+    <result column="similar_queries" jdbcType="LONGVARCHAR" property="similarQueries"/>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -48,7 +49,7 @@
     question_id, agent_id, create_time, user_name, query_state, chat_id, score, feedback
   </sql>
   <sql id="Blob_Column_List">
-    query_text, query_result
+    query_text, query_result, similar_queries
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDOExample" resultMap="ResultMapWithBLOBs">
     select
@@ -67,6 +68,11 @@
     </if>
   </select>
 
+  <select id="selectByPrimaryKey"  resultMap="ResultMapWithBLOBs">
+    select * from s2_chat_query
+    where question_id = #{questionId,jdbcType=BIGINT}
+  </select>
+
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from s2_chat_query
@@ -75,11 +81,12 @@
   <insert id="insert" parameterType="com.tencent.supersonic.chat.persistence.dataobject.ChatQueryDO" useGeneratedKeys="true" keyProperty="questionId">
     insert into s2_chat_query (agent_id, create_time, user_name,
       query_state, chat_id, score,
-      feedback, query_text, query_result
+      feedback, query_text, query_result, similar_queries
       )
     values (#{agentId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{userName,jdbcType=VARCHAR},
       #{queryState,jdbcType=INTEGER}, #{chatId,jdbcType=BIGINT}, #{score,jdbcType=INTEGER},
-      #{feedback,jdbcType=VARCHAR}, #{queryText,jdbcType=LONGVARCHAR}, #{queryResult,jdbcType=LONGVARCHAR}
+      #{feedback,jdbcType=VARCHAR}, #{queryText,jdbcType=LONGVARCHAR}, #{queryResult,jdbcType=LONGVARCHAR},
+      #{similarQueries, jdbcType=LONGVARCHAR}
       )
   </insert>
 
@@ -110,6 +117,9 @@
       <if test="queryResult != null">
         query_result = #{queryResult,jdbcType=LONGVARCHAR},
       </if>
+      <if test="similarQueries != null">
+        similar_queries = #{similarQueries,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where question_id = #{questionId,jdbcType=BIGINT}
   </update>

launchers/standalone/src/main/resources/META-INF/spring.factories

@@ -27,7 +27,8 @@ com.tencent.supersonic.chat.processor.parse.ParseResultProcessor=\
     com.tencent.supersonic.chat.processor.parse.EntityInfoProcessor, \
     com.tencent.supersonic.chat.processor.parse.SqlInfoProcessor, \
     com.tencent.supersonic.chat.processor.parse.TimeCostProcessor, \
-    com.tencent.supersonic.chat.processor.parse.RespBuildProcessor
+    com.tencent.supersonic.chat.processor.parse.RespBuildProcessor, \
+    com.tencent.supersonic.chat.processor.parse.SimilarQueryProcessor
 
 com.tencent.supersonic.chat.api.component.SemanticInterpreter=\
     com.tencent.supersonic.knowledge.semantic.LocalSemanticInterpreter
@@ -42,7 +43,8 @@ com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\
     com.tencent.supersonic.auth.authentication.adaptor.DefaultUserAdaptor
 
 com.tencent.supersonic.chat.processor.execute.ExecuteResultProcessor=\
-    com.tencent.supersonic.chat.processor.execute.SimilarMetricProcessor
+    com.tencent.supersonic.chat.processor.execute.SimilarMetricProcessor,\
+    com.tencent.supersonic.chat.processor.execute.DimensionRecommendProcessor
 
 com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\
     com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore

launchers/standalone/src/main/resources/db/schema-h2.sql

@@ -37,6 +37,7 @@ CREATE TABLE `s2_chat_query`
     `query_result` mediumtext NOT NULL ,
     `score`             int DEFAULT '0',
     `feedback`          varchar(1024) DEFAULT '',
+    `similar_queries`          varchar(1024) DEFAULT '',
     PRIMARY KEY (`question_id`)
 );
 

launchers/standalone/src/main/resources/db/schema-mysql.sql

@@ -157,19 +157,21 @@ CREATE TABLE `s2_chat_parse` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
-CREATE TABLE `s2_chat_query` (
+CREATE TABLE `s2_chat_query`
-                                 `question_id` bigint(20) NOT NULL AUTO_INCREMENT,
+(
-                                 `agent_id` int(11) DEFAULT NULL,
+    `question_id`     bigint(20) NOT NULL AUTO_INCREMENT,
-                                 `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `agent_id`        int(11)             DEFAULT NULL,
-                                 `query_text` mediumtext,
+    `create_time`     timestamp  NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                                 `user_name` varchar(150) DEFAULT NULL,
+    `query_text`      mediumtext,
-                                 `query_state` int(1) DEFAULT NULL,
+    `user_name`       varchar(150)        DEFAULT NULL,
-                                 `chat_id` bigint(20) NOT NULL,
+    `query_state`     int(1)              DEFAULT NULL,
-                                 `query_result` mediumtext,
+    `chat_id`         bigint(20) NOT NULL,
-                                 `score` int(11) DEFAULT '0',
+    `query_result`    mediumtext,
-                                 `feedback` varchar(1024) DEFAULT '',
+    `score`           int(11)             DEFAULT '0',
-                                 PRIMARY KEY (`question_id`)
+    `feedback`        varchar(1024)       DEFAULT '',
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+    `similar_queries` varchar(1024)       DEFAULT '',
+    PRIMARY KEY (`question_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8;
 
 
 CREATE TABLE `s2_chat_statistics` (

launchers/standalone/src/main/resources/db/sql-update.sql

@@ -142,4 +142,7 @@ CREATE TABLE `s2_metric_query_default_config`
     `updated_at`     datetime null,
     `created_by`     varchar(100) null,
     `updated_by`     varchar(100) null
-)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+--20231214
+alter table s2_chat_query add column `similar_queries` varchar(1024) DEFAULT '';

launchers/standalone/src/test/resources/db/schema-h2.sql

@@ -37,6 +37,7 @@ CREATE TABLE `s2_chat_query`
     `query_result` mediumtext NOT NULL ,
     `score`             int DEFAULT '0',
     `feedback`          varchar(1024) DEFAULT '',
+    `similar_queries`  varchar(1024) DEFAULT '',
     PRIMARY KEY (`question_id`)
 );
 
@@ -200,6 +201,7 @@ CREATE TABLE IF NOT EXISTS `s2_metric` (
     `alias` varchar(500) DEFAULT NULL,
     `tags` varchar(500) DEFAULT NULL,
     `relate_dimensions` varchar(500) DEFAULT NULL,
+    `ext` LONGVARCHAR DEFAULT NULL  ,
     PRIMARY KEY (`id`)
     );
 COMMENT ON TABLE s2_metric IS 'metric information table';
@@ -530,4 +532,16 @@ CREATE TABLE s2_sys_parameter
     id  INT PRIMARY KEY AUTO_INCREMENT,
     admin varchar(500),
     parameters text null
+);
+
+CREATE TABLE `s2_metric_query_default_config`(
+    `id`             bigint        NOT NULL AUTO_INCREMENT,
+    `metric_id`      bigint,
+    `user_name`      varchar(255)  NOT NULL,
+    `default_config` varchar(1000) NOT NULL,
+    `created_at`     TIMESTAMP null,
+    `updated_at`     TIMESTAMP null,
+    `created_by`     varchar(100) null,
+    `updated_by`     varchar(100)  not null,
+    PRIMARY KEY (`id`)
 );

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.semantic.api.model.response;
 
+import com.google.common.base.Objects;
 import com.tencent.supersonic.semantic.api.model.pojo.Identify;
 import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail;
 import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension;
@@ -62,4 +63,24 @@ public class ModelResp extends SchemaItem {
         return null;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        ModelResp that = (ModelResp) o;
+        return Objects.equal(getId(), that.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(super.hashCode(), getId());
+    }
+
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/MetricServiceImpl.java

@@ -295,16 +295,19 @@ public class MetricServiceImpl implements MetricService {
     }
 
     @Override
-    public void saveOrUpdateMetricQueryDefaultConfig(MetricQueryDefaultConfig queryDefaultConfig, User user) {
+    public void saveMetricQueryDefaultConfig(MetricQueryDefaultConfig defaultConfig, User user) {
-        MetricQueryDefaultConfigDO metricQueryDefaultConfigDO = new MetricQueryDefaultConfigDO();
+        MetricQueryDefaultConfigDO defaultConfigDO =
-        if (queryDefaultConfig.getId() == null) {
+                metricRepository.getDefaultQueryConfig(defaultConfig.getMetricId(), user.getName());
-            queryDefaultConfig.createdBy(user.getName());
+        if (defaultConfigDO == null) {
-            BeanMapper.mapper(queryDefaultConfig, metricQueryDefaultConfigDO);
+            defaultConfigDO = new MetricQueryDefaultConfigDO();
-            metricRepository.saveDefaultQueryConfig(metricQueryDefaultConfigDO);
+            defaultConfig.createdBy(user.getName());
+            BeanMapper.mapper(defaultConfig, defaultConfigDO);
+            metricRepository.saveDefaultQueryConfig(defaultConfigDO);
         } else {
-            queryDefaultConfig.updatedBy(user.getName());
+            defaultConfig.setId(defaultConfigDO.getId());
-            BeanMapper.mapper(queryDefaultConfig, metricQueryDefaultConfigDO);
+            defaultConfig.updatedBy(user.getName());
-            metricRepository.updateDefaultQueryConfig(metricQueryDefaultConfigDO);
+            BeanMapper.mapper(defaultConfig, defaultConfigDO);
+            metricRepository.updateDefaultQueryConfig(defaultConfigDO);
         }
     }
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java

@@ -15,7 +15,6 @@ import com.tencent.supersonic.semantic.api.model.pojo.Identify;
 import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter;
 import com.tencent.supersonic.semantic.api.model.pojo.Measure;
 import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension;
-import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import com.tencent.supersonic.semantic.api.model.request.DateInfoReq;
 import com.tencent.supersonic.semantic.api.model.request.DimensionReq;
 import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq;
@@ -46,9 +45,7 @@ import com.tencent.supersonic.semantic.model.domain.manager.DatasourceYamlManage
 import com.tencent.supersonic.semantic.model.domain.manager.DimensionYamlManager;
 import com.tencent.supersonic.semantic.model.domain.manager.MetricYamlManager;
 import com.tencent.supersonic.semantic.model.domain.pojo.Datasource;
-import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter;
 import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter;
-import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter;
 import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter;
 import com.tencent.supersonic.semantic.model.domain.repository.DateInfoRepository;
 import com.tencent.supersonic.semantic.model.domain.repository.ModelRepository;
@@ -66,7 +63,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -307,8 +303,7 @@ public class ModelServiceImpl implements ModelService {
             modelRespSet = modelRespSet.stream().filter(modelResp ->
                     modelResp.getDomainId().equals(domainId)).collect(Collectors.toSet());
         }
-        return fillMetricInfo(new ArrayList<>(modelRespSet)).stream()
+        return new ArrayList<>(modelRespSet);
-                .sorted(Comparator.comparingLong(SchemaItem::getId)).collect(Collectors.toList());
     }
 
     public List<ModelResp> getModelRespAuthInheritDomain(User user, AuthType authType) {
@@ -464,21 +459,6 @@ public class ModelServiceImpl implements ModelService {
         modelRepository.batchUpdate(modelDOS);
     }
 
-    private List<ModelResp> fillMetricInfo(List<ModelResp> modelResps) {
-        if (CollectionUtils.isEmpty(modelResps)) {
-            return modelResps;
-        }
-        Map<Long, List<MetricResp>> metricMap = metricService.getMetrics(new MetricFilter()).stream()
-                .collect(Collectors.groupingBy(MetricResp::getModelId));
-        Map<Long, List<DimensionResp>> dimensionMap = dimensionService.getDimensions(new DimensionFilter()).stream()
-                .collect(Collectors.groupingBy(DimensionResp::getModelId));
-        modelResps.forEach(modelResp -> {
-            modelResp.setDimensionCnt(dimensionMap.getOrDefault(modelResp.getId(), Lists.newArrayList()).size());
-            modelResp.setMetricCnt(metricMap.getOrDefault(modelResp.getId(), Lists.newArrayList()).size());
-        });
-        return modelResps;
-    }
-
     protected ModelDO getModelDO(Long id) {
         return modelRepository.getModelById(id);
     }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.tencent.supersonic.semantic.model.application;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.semantic.api.model.request.ViewInfoReq;
 import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
 import com.tencent.supersonic.semantic.api.model.response.MetricResp;
@@ -13,7 +14,6 @@ import com.tencent.supersonic.semantic.model.domain.MetricService;
 import com.tencent.supersonic.semantic.model.domain.ModelService;
 import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO;
 import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter;
-import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter;
 import com.tencent.supersonic.semantic.model.domain.repository.ViewInfoRepository;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -44,11 +44,9 @@ public class ViewInfoServiceImpl {
         return viewInfoRepository.getViewInfoList(domainId);
     }
 
-    public List<ModelSchemaRelaResp> getDomainSchema(Long domainId) {
+    public List<ModelSchemaRelaResp> getDomainSchema(Long domainId, User user) {
         List<ModelSchemaRelaResp> domainSchemaRelaResps = Lists.newArrayList();
-        ModelFilter modelFilter = new ModelFilter();
+        List<ModelResp> modelResps = modelService.getModelListWithAuth(user, domainId, AuthType.ADMIN);
-        modelFilter.setDomainIds(Lists.newArrayList(domainId));
-        List<ModelResp> modelResps = modelService.getModelList(modelFilter);
         for (ModelResp modelResp : modelResps) {
             ModelSchemaRelaResp domainSchemaRelaResp = new ModelSchemaRelaResp();
             MetaFilter metaFilter = new MetaFilter();

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/MetricService.java

@@ -42,7 +42,7 @@ public interface MetricService {
 
     List<DataItem> getDataItems(Long modelId);
 
-    void saveOrUpdateMetricQueryDefaultConfig(MetricQueryDefaultConfig queryDefaultConfig, User user);
+    void saveMetricQueryDefaultConfig(MetricQueryDefaultConfig defaultConfig, User user);
 
     MetricQueryDefaultConfig getMetricQueryDefaultConfig(Long metricId, User user);
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java

@@ -134,7 +134,7 @@ public class MetricController {
                                              HttpServletRequest request,
                                              HttpServletResponse response) {
         User user = UserHolder.findUser(request, response);
-        metricService.saveOrUpdateMetricQueryDefaultConfig(queryDefaultConfig, user);
+        metricService.saveMetricQueryDefaultConfig(queryDefaultConfig, user);
         return true;
     }
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java

@@ -47,8 +47,11 @@ public class ViewInfoController {
     }
 
     @GetMapping("/getDomainSchemaRela/{domainId}")
-    public List<ModelSchemaRelaResp> getDomainSchema(@PathVariable("domainId") Long domainId) {
+    public List<ModelSchemaRelaResp> getDomainSchema(@PathVariable("domainId") Long domainId,
-        return viewInfoServiceImpl.getDomainSchema(domainId);
+                                                     HttpServletRequest request,
+                                                     HttpServletResponse response) {
+        User user = UserHolder.findUser(request, response);
+        return viewInfoServiceImpl.getDomainSchema(domainId, user);
     }
 
 }

semantic/model/src/main/resources/mapper/DomainDOMapper.xml

@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tencent.supersonic.semantic.model.infrastructure.mapper.DomainDOMapper">
-  <resultMap id="BaseResultMap" type="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="biz_name" jdbcType="VARCHAR" property="bizName" />
-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
-    <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
-    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
-    <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
-    <result column="admin" jdbcType="VARCHAR" property="admin" />
-    <result column="admin_org" jdbcType="VARCHAR" property="adminOrg" />
-    <result column="is_open" jdbcType="INTEGER" property="isOpen" />
-    <result column="viewer" jdbcType="VARCHAR" property="viewer" />
-    <result column="view_org" jdbcType="VARCHAR" property="viewOrg" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, biz_name, parent_id, status, created_at, created_by, updated_at, updated_by, 
-    admin, admin_org, is_open, viewer, view_org
-  </sql>
-  <select id="selectByExample" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDOExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from s2_domain
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limitStart != null and limitStart>=0">
-      limit #{limitStart} , #{limitEnd}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from s2_domain
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from s2_domain
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO">
-    insert into s2_domain (id, name, biz_name, 
-      parent_id, status, created_at, 
-      created_by, updated_at, updated_by, 
-      admin, admin_org, is_open, 
-      viewer, view_org)
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{bizName,jdbcType=VARCHAR}, 
-      #{parentId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{createdBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, 
-      #{admin,jdbcType=VARCHAR}, #{adminOrg,jdbcType=VARCHAR}, #{isOpen,jdbcType=INTEGER}, 
-      #{viewer,jdbcType=VARCHAR}, #{viewOrg,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO">
-    insert into s2_domain
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="bizName != null">
-        biz_name,
-      </if>
-      <if test="parentId != null">
-        parent_id,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createdAt != null">
-        created_at,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedAt != null">
-        updated_at,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="admin != null">
-        admin,
-      </if>
-      <if test="adminOrg != null">
-        admin_org,
-      </if>
-      <if test="isOpen != null">
-        is_open,
-      </if>
-      <if test="viewer != null">
-        viewer,
-      </if>
-      <if test="viewOrg != null">
-        view_org,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="bizName != null">
-        #{bizName,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createdAt != null">
-        #{createdAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updatedAt != null">
-        #{updatedAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=VARCHAR},
-      </if>
-      <if test="admin != null">
-        #{admin,jdbcType=VARCHAR},
-      </if>
-      <if test="adminOrg != null">
-        #{adminOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="isOpen != null">
-        #{isOpen,jdbcType=INTEGER},
-      </if>
-      <if test="viewer != null">
-        #{viewer,jdbcType=VARCHAR},
-      </if>
-      <if test="viewOrg != null">
-        #{viewOrg,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDOExample" resultType="java.lang.Long">
-    select count(*) from s2_domain
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO">
-    update s2_domain
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="bizName != null">
-        biz_name = #{bizName,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createdAt != null">
-        created_at = #{createdAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updatedAt != null">
-        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=VARCHAR},
-      </if>
-      <if test="admin != null">
-        admin = #{admin,jdbcType=VARCHAR},
-      </if>
-      <if test="adminOrg != null">
-        admin_org = #{adminOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="isOpen != null">
-        is_open = #{isOpen,jdbcType=INTEGER},
-      </if>
-      <if test="viewer != null">
-        viewer = #{viewer,jdbcType=VARCHAR},
-      </if>
-      <if test="viewOrg != null">
-        view_org = #{viewOrg,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO">
-    update s2_domain
-    set name = #{name,jdbcType=VARCHAR},
-      biz_name = #{bizName,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
-      status = #{status,jdbcType=INTEGER},
-      created_at = #{createdAt,jdbcType=TIMESTAMP},
-      created_by = #{createdBy,jdbcType=VARCHAR},
-      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      updated_by = #{updatedBy,jdbcType=VARCHAR},
-      admin = #{admin,jdbcType=VARCHAR},
-      admin_org = #{adminOrg,jdbcType=VARCHAR},
-      is_open = #{isOpen,jdbcType=INTEGER},
-      viewer = #{viewer,jdbcType=VARCHAR},
-      view_org = #{viewOrg,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>