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 4a5445dc14..a67274f609 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 @@ -1,6 +1,7 @@ package com.tencent.supersonic.chat.api.pojo.response; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; +import com.tencent.supersonic.headless.api.pojo.response.ParseTimeCostResp; import com.tencent.supersonic.headless.api.pojo.response.QueryResult; import lombok.Data; import java.util.Date; @@ -19,5 +20,6 @@ public class QueryResp { private QueryResult queryResult; private List parseInfos; private List similarQueries; + private ParseTimeCostResp parseTimeCost = new ParseTimeCostResp(); } \ No newline at end of file diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDOExample.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDOExample.java deleted file mode 100644 index 2f454bfe3b..0000000000 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDOExample.java +++ /dev/null @@ -1,1010 +0,0 @@ -package com.tencent.supersonic.chat.server.persistence.dataobject; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class AgentDOExample { - /** - * s2_agent - */ - protected String orderByClause; - - /** - * s2_agent - */ - protected boolean distinct; - - /** - * s2_agent - */ - protected List oredCriteria; - - /** - * s2_agent - */ - protected Integer limitStart; - - /** - * s2_agent - */ - protected Integer limitEnd; - - /** - * @mbg.generated - */ - public AgentDOExample() { - oredCriteria = new ArrayList(); - } - - /** - * @mbg.generated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * @mbg.generated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * @mbg.generated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * @mbg.generated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * @mbg.generated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * @mbg.generated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * @mbg.generated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * @mbg.generated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * @mbg.generated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - /** - * @mbg.generated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * @mbg.generated - */ - public void setLimitStart(Integer limitStart) { - this.limitStart = limitStart; - } - - /** - * @mbg.generated - */ - public Integer getLimitStart() { - return limitStart; - } - - /** - * @mbg.generated - */ - public void setLimitEnd(Integer limitEnd) { - this.limitEnd = limitEnd; - } - - /** - * @mbg.generated - */ - public Integer getLimitEnd() { - return limitEnd; - } - - /** - * s2_agent null - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Integer value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Integer value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andExamplesIsNull() { - addCriterion("examples is null"); - return (Criteria) this; - } - - public Criteria andExamplesIsNotNull() { - addCriterion("examples is not null"); - return (Criteria) this; - } - - public Criteria andExamplesEqualTo(String value) { - addCriterion("examples =", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesNotEqualTo(String value) { - addCriterion("examples <>", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesGreaterThan(String value) { - addCriterion("examples >", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesGreaterThanOrEqualTo(String value) { - addCriterion("examples >=", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesLessThan(String value) { - addCriterion("examples <", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesLessThanOrEqualTo(String value) { - addCriterion("examples <=", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesLike(String value) { - addCriterion("examples like", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesNotLike(String value) { - addCriterion("examples not like", value, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesIn(List values) { - addCriterion("examples in", values, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesNotIn(List values) { - addCriterion("examples not in", values, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesBetween(String value1, String value2) { - addCriterion("examples between", value1, value2, "examples"); - return (Criteria) this; - } - - public Criteria andExamplesNotBetween(String value1, String value2) { - addCriterion("examples not between", value1, value2, "examples"); - return (Criteria) this; - } - - public Criteria andConfigIsNull() { - addCriterion("config is null"); - return (Criteria) this; - } - - public Criteria andConfigIsNotNull() { - addCriterion("config is not null"); - return (Criteria) this; - } - - public Criteria andConfigEqualTo(String value) { - addCriterion("config =", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigNotEqualTo(String value) { - addCriterion("config <>", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigGreaterThan(String value) { - addCriterion("config >", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigGreaterThanOrEqualTo(String value) { - addCriterion("config >=", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigLessThan(String value) { - addCriterion("config <", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigLessThanOrEqualTo(String value) { - addCriterion("config <=", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigLike(String value) { - addCriterion("config like", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigNotLike(String value) { - addCriterion("config not like", value, "config"); - return (Criteria) this; - } - - public Criteria andConfigIn(List values) { - addCriterion("config in", values, "config"); - return (Criteria) this; - } - - public Criteria andConfigNotIn(List values) { - addCriterion("config not in", values, "config"); - return (Criteria) this; - } - - public Criteria andConfigBetween(String value1, String value2) { - addCriterion("config between", value1, value2, "config"); - return (Criteria) this; - } - - public Criteria andConfigNotBetween(String value1, String value2) { - addCriterion("config not between", value1, value2, "config"); - return (Criteria) this; - } - - public Criteria andCreatedByIsNull() { - addCriterion("created_by is null"); - return (Criteria) this; - } - - public Criteria andCreatedByIsNotNull() { - addCriterion("created_by is not null"); - return (Criteria) this; - } - - public Criteria andCreatedByEqualTo(String value) { - addCriterion("created_by =", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotEqualTo(String value) { - addCriterion("created_by <>", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByGreaterThan(String value) { - addCriterion("created_by >", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByGreaterThanOrEqualTo(String value) { - addCriterion("created_by >=", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLessThan(String value) { - addCriterion("created_by <", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLessThanOrEqualTo(String value) { - addCriterion("created_by <=", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLike(String value) { - addCriterion("created_by like", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotLike(String value) { - addCriterion("created_by not like", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByIn(List values) { - addCriterion("created_by in", values, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotIn(List values) { - addCriterion("created_by not in", values, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByBetween(String value1, String value2) { - addCriterion("created_by between", value1, value2, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotBetween(String value1, String value2) { - addCriterion("created_by not between", value1, value2, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedByIsNull() { - addCriterion("updated_by is null"); - return (Criteria) this; - } - - public Criteria andUpdatedByIsNotNull() { - addCriterion("updated_by is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedByEqualTo(String value) { - addCriterion("updated_by =", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotEqualTo(String value) { - addCriterion("updated_by <>", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByGreaterThan(String value) { - addCriterion("updated_by >", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByGreaterThanOrEqualTo(String value) { - addCriterion("updated_by >=", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLessThan(String value) { - addCriterion("updated_by <", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLessThanOrEqualTo(String value) { - addCriterion("updated_by <=", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLike(String value) { - addCriterion("updated_by like", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotLike(String value) { - addCriterion("updated_by not like", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByIn(List values) { - addCriterion("updated_by in", values, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotIn(List values) { - addCriterion("updated_by not in", values, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByBetween(String value1, String value2) { - addCriterion("updated_by between", value1, value2, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotBetween(String value1, String value2) { - addCriterion("updated_by not between", value1, value2, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andEnableSearchIsNull() { - addCriterion("enable_search is null"); - return (Criteria) this; - } - - public Criteria andEnableSearchIsNotNull() { - addCriterion("enable_search is not null"); - return (Criteria) this; - } - - public Criteria andEnableSearchEqualTo(Integer value) { - addCriterion("enable_search =", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchNotEqualTo(Integer value) { - addCriterion("enable_search <>", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchGreaterThan(Integer value) { - addCriterion("enable_search >", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchGreaterThanOrEqualTo(Integer value) { - addCriterion("enable_search >=", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchLessThan(Integer value) { - addCriterion("enable_search <", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchLessThanOrEqualTo(Integer value) { - addCriterion("enable_search <=", value, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchIn(List values) { - addCriterion("enable_search in", values, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchNotIn(List values) { - addCriterion("enable_search not in", values, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchBetween(Integer value1, Integer value2) { - addCriterion("enable_search between", value1, value2, "enableSearch"); - return (Criteria) this; - } - - public Criteria andEnableSearchNotBetween(Integer value1, Integer value2) { - addCriterion("enable_search not between", value1, value2, "enableSearch"); - return (Criteria) this; - } - } - - /** - * s2_agent - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * s2_agent null - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - } -} diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDO.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDO.java index e525e1c864..03e7017b1a 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDO.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDO.java @@ -1,12 +1,17 @@ package com.tencent.supersonic.chat.server.persistence.dataobject; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("s2_chat_query") public class ChatQueryDO { /** */ + @TableId(type = IdType.AUTO) private Long questionId; /** @@ -47,4 +52,6 @@ public class ChatQueryDO { private String similarQueries; + private String parseTimeCost; + } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDOExample.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDOExample.java deleted file mode 100644 index 311d77a751..0000000000 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatQueryDOExample.java +++ /dev/null @@ -1,790 +0,0 @@ -package com.tencent.supersonic.chat.server.persistence.dataobject; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ChatQueryDOExample { - /** - * s2_chat_query - */ - protected String orderByClause; - - /** - * s2_chat_query - */ - protected boolean distinct; - - /** - * s2_chat_query - */ - protected List oredCriteria; - - /** - * s2_chat_query - */ - protected Integer limitStart; - - /** - * s2_chat_query - */ - protected Integer limitEnd; - - /** - * @mbg.generated - */ - public ChatQueryDOExample() { - oredCriteria = new ArrayList(); - } - - /** - * @mbg.generated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * @mbg.generated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * @mbg.generated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * @mbg.generated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * @mbg.generated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * @mbg.generated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * @mbg.generated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * @mbg.generated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * @mbg.generated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - /** - * @mbg.generated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * @mbg.generated - */ - public void setLimitStart(Integer limitStart) { - this.limitStart = limitStart; - } - - /** - * @mbg.generated - */ - public Integer getLimitStart() { - return limitStart; - } - - /** - * @mbg.generated - */ - public void setLimitEnd(Integer limitEnd) { - this.limitEnd = limitEnd; - } - - /** - * @mbg.generated - */ - public Integer getLimitEnd() { - return limitEnd; - } - - /** - * s2_chat_query null - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andQuestionIdIsNull() { - addCriterion("question_id is null"); - return (Criteria) this; - } - - public Criteria andQuestionIdIsNotNull() { - addCriterion("question_id is not null"); - return (Criteria) this; - } - - public Criteria andQuestionIdEqualTo(Long value) { - addCriterion("question_id =", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdNotEqualTo(Long value) { - addCriterion("question_id <>", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdGreaterThan(Long value) { - addCriterion("question_id >", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) { - addCriterion("question_id >=", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdLessThan(Long value) { - addCriterion("question_id <", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdLessThanOrEqualTo(Long value) { - addCriterion("question_id <=", value, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdIn(List values) { - addCriterion("question_id in", values, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdNotIn(List values) { - addCriterion("question_id not in", values, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdBetween(Long value1, Long value2) { - addCriterion("question_id between", value1, value2, "questionId"); - return (Criteria) this; - } - - public Criteria andQuestionIdNotBetween(Long value1, Long value2) { - addCriterion("question_id not between", value1, value2, "questionId"); - return (Criteria) this; - } - - public Criteria andAgentIdIsNull() { - addCriterion("agent_id is null"); - return (Criteria) this; - } - - public Criteria andAgentIdIsNotNull() { - addCriterion("agent_id is not null"); - return (Criteria) this; - } - - public Criteria andAgentIdEqualTo(Integer value) { - addCriterion("agent_id =", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdNotEqualTo(Integer value) { - addCriterion("agent_id <>", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdGreaterThan(Integer value) { - addCriterion("agent_id >", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdGreaterThanOrEqualTo(Integer value) { - addCriterion("agent_id >=", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdLessThan(Integer value) { - addCriterion("agent_id <", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdLessThanOrEqualTo(Integer value) { - addCriterion("agent_id <=", value, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdIn(List values) { - addCriterion("agent_id in", values, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdNotIn(List values) { - addCriterion("agent_id not in", values, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdBetween(Integer value1, Integer value2) { - addCriterion("agent_id between", value1, value2, "agentId"); - return (Criteria) this; - } - - public Criteria andAgentIdNotBetween(Integer value1, Integer value2) { - addCriterion("agent_id not between", value1, value2, "agentId"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUserNameIsNull() { - addCriterion("user_name is null"); - return (Criteria) this; - } - - public Criteria andUserNameIsNotNull() { - addCriterion("user_name is not null"); - return (Criteria) this; - } - - public Criteria andUserNameEqualTo(String value) { - addCriterion("user_name =", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotEqualTo(String value) { - addCriterion("user_name <>", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameGreaterThan(String value) { - addCriterion("user_name >", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameGreaterThanOrEqualTo(String value) { - addCriterion("user_name >=", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLessThan(String value) { - addCriterion("user_name <", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLessThanOrEqualTo(String value) { - addCriterion("user_name <=", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLike(String value) { - addCriterion("user_name like", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotLike(String value) { - addCriterion("user_name not like", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameIn(List values) { - addCriterion("user_name in", values, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotIn(List values) { - addCriterion("user_name not in", values, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameBetween(String value1, String value2) { - addCriterion("user_name between", value1, value2, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotBetween(String value1, String value2) { - addCriterion("user_name not between", value1, value2, "userName"); - return (Criteria) this; - } - - public Criteria andQueryStateIsNull() { - addCriterion("query_state is null"); - return (Criteria) this; - } - - public Criteria andQueryStateIsNotNull() { - addCriterion("query_state is not null"); - return (Criteria) this; - } - - public Criteria andQueryStateEqualTo(Integer value) { - addCriterion("query_state =", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateNotEqualTo(Integer value) { - addCriterion("query_state <>", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateGreaterThan(Integer value) { - addCriterion("query_state >", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateGreaterThanOrEqualTo(Integer value) { - addCriterion("query_state >=", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateLessThan(Integer value) { - addCriterion("query_state <", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateLessThanOrEqualTo(Integer value) { - addCriterion("query_state <=", value, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateIn(List values) { - addCriterion("query_state in", values, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateNotIn(List values) { - addCriterion("query_state not in", values, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateBetween(Integer value1, Integer value2) { - addCriterion("query_state between", value1, value2, "queryState"); - return (Criteria) this; - } - - public Criteria andQueryStateNotBetween(Integer value1, Integer value2) { - addCriterion("query_state not between", value1, value2, "queryState"); - return (Criteria) this; - } - - public Criteria andChatIdIsNull() { - addCriterion("chat_id is null"); - return (Criteria) this; - } - - public Criteria andChatIdIsNotNull() { - addCriterion("chat_id is not null"); - return (Criteria) this; - } - - public Criteria andChatIdEqualTo(Long value) { - addCriterion("chat_id =", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdNotEqualTo(Long value) { - addCriterion("chat_id <>", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdGreaterThan(Long value) { - addCriterion("chat_id >", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdGreaterThanOrEqualTo(Long value) { - addCriterion("chat_id >=", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdLessThan(Long value) { - addCriterion("chat_id <", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdLessThanOrEqualTo(Long value) { - addCriterion("chat_id <=", value, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdIn(List values) { - addCriterion("chat_id in", values, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdNotIn(List values) { - addCriterion("chat_id not in", values, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdBetween(Long value1, Long value2) { - addCriterion("chat_id between", value1, value2, "chatId"); - return (Criteria) this; - } - - public Criteria andChatIdNotBetween(Long value1, Long value2) { - addCriterion("chat_id not between", value1, value2, "chatId"); - return (Criteria) this; - } - - public Criteria andScoreIsNull() { - addCriterion("score is null"); - return (Criteria) this; - } - - public Criteria andScoreIsNotNull() { - addCriterion("score is not null"); - return (Criteria) this; - } - - public Criteria andScoreEqualTo(Integer value) { - addCriterion("score =", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotEqualTo(Integer value) { - addCriterion("score <>", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThan(Integer value) { - addCriterion("score >", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { - addCriterion("score >=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThan(Integer value) { - addCriterion("score <", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThanOrEqualTo(Integer value) { - addCriterion("score <=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreIn(List values) { - addCriterion("score in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotIn(List values) { - addCriterion("score not in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreBetween(Integer value1, Integer value2) { - addCriterion("score between", value1, value2, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotBetween(Integer value1, Integer value2) { - addCriterion("score not between", value1, value2, "score"); - return (Criteria) this; - } - - public Criteria andFeedbackIsNull() { - addCriterion("feedback is null"); - return (Criteria) this; - } - - public Criteria andFeedbackIsNotNull() { - addCriterion("feedback is not null"); - return (Criteria) this; - } - - public Criteria andFeedbackEqualTo(String value) { - addCriterion("feedback =", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackNotEqualTo(String value) { - addCriterion("feedback <>", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackGreaterThan(String value) { - addCriterion("feedback >", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackGreaterThanOrEqualTo(String value) { - addCriterion("feedback >=", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackLessThan(String value) { - addCriterion("feedback <", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackLessThanOrEqualTo(String value) { - addCriterion("feedback <=", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackLike(String value) { - addCriterion("feedback like", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackNotLike(String value) { - addCriterion("feedback not like", value, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackIn(List values) { - addCriterion("feedback in", values, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackNotIn(List values) { - addCriterion("feedback not in", values, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackBetween(String value1, String value2) { - addCriterion("feedback between", value1, value2, "feedback"); - return (Criteria) this; - } - - public Criteria andFeedbackNotBetween(String value1, String value2) { - addCriterion("feedback not between", value1, value2, "feedback"); - return (Criteria) this; - } - } - - /** - * s2_chat_query - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * s2_chat_query null - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - } -} diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/PluginDOExample.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/PluginDOExample.java deleted file mode 100644 index 42e3ea1313..0000000000 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/PluginDOExample.java +++ /dev/null @@ -1,960 +0,0 @@ -package com.tencent.supersonic.chat.server.persistence.dataobject; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class PluginDOExample { - /** - * s2_plugin - */ - protected String orderByClause; - - /** - * s2_plugin - */ - protected boolean distinct; - - /** - * s2_plugin - */ - protected List oredCriteria; - - /** - * s2_plugin - */ - protected Integer limitStart; - - /** - * s2_plugin - */ - protected Integer limitEnd; - - /** - * @mbg.generated - */ - public PluginDOExample() { - oredCriteria = new ArrayList(); - } - - /** - * @mbg.generated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * @mbg.generated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * @mbg.generated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * @mbg.generated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * @mbg.generated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * @mbg.generated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * @mbg.generated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * @mbg.generated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * @mbg.generated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - /** - * @mbg.generated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * @mbg.generated - */ - public void setLimitStart(Integer limitStart) { - this.limitStart = limitStart; - } - - /** - * @mbg.generated - */ - public Integer getLimitStart() { - return limitStart; - } - - /** - * @mbg.generated - */ - public void setLimitEnd(Integer limitEnd) { - this.limitEnd = limitEnd; - } - - /** - * @mbg.generated - */ - public Integer getLimitEnd() { - return limitEnd; - } - - /** - * s2_plugin null - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andModelIsNull() { - addCriterion("model is null"); - return (Criteria) this; - } - - public Criteria andModelIsNotNull() { - addCriterion("model is not null"); - return (Criteria) this; - } - - public Criteria andModelEqualTo(String value) { - addCriterion("model =", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotEqualTo(String value) { - addCriterion("model <>", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThan(String value) { - addCriterion("model >", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThanOrEqualTo(String value) { - addCriterion("model >=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThan(String value) { - addCriterion("model <", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThanOrEqualTo(String value) { - addCriterion("model <=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLike(String value) { - addCriterion("model like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotLike(String value) { - addCriterion("model not like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelIn(List values) { - addCriterion("model in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelNotIn(List values) { - addCriterion("model not in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelBetween(String value1, String value2) { - addCriterion("model between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andModelNotBetween(String value1, String value2) { - addCriterion("model not between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andPatternIsNull() { - addCriterion("pattern is null"); - return (Criteria) this; - } - - public Criteria andPatternIsNotNull() { - addCriterion("pattern is not null"); - return (Criteria) this; - } - - public Criteria andPatternEqualTo(String value) { - addCriterion("pattern =", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternNotEqualTo(String value) { - addCriterion("pattern <>", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternGreaterThan(String value) { - addCriterion("pattern >", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternGreaterThanOrEqualTo(String value) { - addCriterion("pattern >=", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternLessThan(String value) { - addCriterion("pattern <", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternLessThanOrEqualTo(String value) { - addCriterion("pattern <=", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternLike(String value) { - addCriterion("pattern like", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternNotLike(String value) { - addCriterion("pattern not like", value, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternIn(List values) { - addCriterion("pattern in", values, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternNotIn(List values) { - addCriterion("pattern not in", values, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternBetween(String value1, String value2) { - addCriterion("pattern between", value1, value2, "pattern"); - return (Criteria) this; - } - - public Criteria andPatternNotBetween(String value1, String value2) { - addCriterion("pattern not between", value1, value2, "pattern"); - return (Criteria) this; - } - - public Criteria andParseModeIsNull() { - addCriterion("parse_mode is null"); - return (Criteria) this; - } - - public Criteria andParseModeIsNotNull() { - addCriterion("parse_mode is not null"); - return (Criteria) this; - } - - public Criteria andParseModeEqualTo(String value) { - addCriterion("parse_mode =", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeNotEqualTo(String value) { - addCriterion("parse_mode <>", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeGreaterThan(String value) { - addCriterion("parse_mode >", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeGreaterThanOrEqualTo(String value) { - addCriterion("parse_mode >=", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeLessThan(String value) { - addCriterion("parse_mode <", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeLessThanOrEqualTo(String value) { - addCriterion("parse_mode <=", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeLike(String value) { - addCriterion("parse_mode like", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeNotLike(String value) { - addCriterion("parse_mode not like", value, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeIn(List values) { - addCriterion("parse_mode in", values, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeNotIn(List values) { - addCriterion("parse_mode not in", values, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeBetween(String value1, String value2) { - addCriterion("parse_mode between", value1, value2, "parseMode"); - return (Criteria) this; - } - - public Criteria andParseModeNotBetween(String value1, String value2) { - addCriterion("parse_mode not between", value1, value2, "parseMode"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedByIsNull() { - addCriterion("created_by is null"); - return (Criteria) this; - } - - public Criteria andCreatedByIsNotNull() { - addCriterion("created_by is not null"); - return (Criteria) this; - } - - public Criteria andCreatedByEqualTo(String value) { - addCriterion("created_by =", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotEqualTo(String value) { - addCriterion("created_by <>", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByGreaterThan(String value) { - addCriterion("created_by >", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByGreaterThanOrEqualTo(String value) { - addCriterion("created_by >=", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLessThan(String value) { - addCriterion("created_by <", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLessThanOrEqualTo(String value) { - addCriterion("created_by <=", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByLike(String value) { - addCriterion("created_by like", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotLike(String value) { - addCriterion("created_by not like", value, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByIn(List values) { - addCriterion("created_by in", values, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotIn(List values) { - addCriterion("created_by not in", values, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByBetween(String value1, String value2) { - addCriterion("created_by between", value1, value2, "createdBy"); - return (Criteria) this; - } - - public Criteria andCreatedByNotBetween(String value1, String value2) { - addCriterion("created_by not between", value1, value2, "createdBy"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedByIsNull() { - addCriterion("updated_by is null"); - return (Criteria) this; - } - - public Criteria andUpdatedByIsNotNull() { - addCriterion("updated_by is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedByEqualTo(String value) { - addCriterion("updated_by =", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotEqualTo(String value) { - addCriterion("updated_by <>", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByGreaterThan(String value) { - addCriterion("updated_by >", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByGreaterThanOrEqualTo(String value) { - addCriterion("updated_by >=", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLessThan(String value) { - addCriterion("updated_by <", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLessThanOrEqualTo(String value) { - addCriterion("updated_by <=", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByLike(String value) { - addCriterion("updated_by like", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotLike(String value) { - addCriterion("updated_by not like", value, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByIn(List values) { - addCriterion("updated_by in", values, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotIn(List values) { - addCriterion("updated_by not in", values, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByBetween(String value1, String value2) { - addCriterion("updated_by between", value1, value2, "updatedBy"); - return (Criteria) this; - } - - public Criteria andUpdatedByNotBetween(String value1, String value2) { - addCriterion("updated_by not between", value1, value2, "updatedBy"); - return (Criteria) this; - } - } - - /** - * s2_plugin - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * s2_plugin null - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - } -} diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatQueryDOMapper.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatQueryDOMapper.java index dc4d913b3c..3aac3d9f04 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatQueryDOMapper.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatQueryDOMapper.java @@ -1,21 +1,10 @@ package com.tencent.supersonic.chat.server.persistence.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO; -import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDOExample; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper -public interface ChatQueryDOMapper { - - int insert(ChatQueryDO record); - - List selectByExampleWithBLOBs(ChatQueryDOExample example); - - int updateByPrimaryKeyWithBLOBs(ChatQueryDO record); - - Boolean deleteByPrimaryKey(Long questionId); +public interface ChatQueryDOMapper extends BaseMapper { - ChatQueryDO selectByPrimaryKey(Long questionId); } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/ChatQueryRepository.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/ChatQueryRepository.java index ae32afb956..2686aa603b 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/ChatQueryRepository.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/ChatQueryRepository.java @@ -1,13 +1,14 @@ package com.tencent.supersonic.chat.server.persistence.repository; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq; import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq; +import com.tencent.supersonic.chat.api.pojo.response.QueryResp; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatParseDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; -import com.tencent.supersonic.chat.api.pojo.response.QueryResp; import java.util.List; @@ -21,10 +22,10 @@ public interface ChatQueryRepository { List queryShowCase(PageQueryInfoReq pageQueryInfoCommend, int agentId); - ChatQueryDO getLastChatQuery(long chatId); - int updateChatQuery(ChatQueryDO chatQueryDO); + void updateChatQuery(ChatQueryDO chatQueryDO, UpdateWrapper updateWrapper); + Long createChatQuery(ChatParseReq chatParseReq); List batchSaveParseInfo(ChatParseReq chatParseReq, ParseResp parseResult, @@ -34,8 +35,6 @@ List batchSaveParseInfo(ChatParseReq chatParseReq, ParseResp parseR List getParseInfoList(List questionIds); - Boolean deleteChatQuery(Long questionId); - List getContextualParseInfo(Integer chatId); } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatQueryRepositoryImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatQueryRepositoryImpl.java index e09687fa81..33da046b0e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatQueryRepositoryImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatQueryRepositoryImpl.java @@ -1,6 +1,8 @@ package com.tencent.supersonic.chat.server.persistence.repository.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq; @@ -8,8 +10,6 @@ import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatParseDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO; -import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDOExample; -import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDOExample.Criteria; 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; @@ -19,10 +19,12 @@ import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.chat.api.pojo.response.QueryResp; +import com.tencent.supersonic.headless.api.pojo.response.ParseTimeCostResp; import com.tencent.supersonic.headless.api.pojo.response.QueryResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Repository; import org.springframework.util.CollectionUtils; @@ -38,37 +40,33 @@ @Slf4j public class ChatQueryRepositoryImpl implements ChatQueryRepository { - private final ChatQueryDOMapper chatQueryDOMapper; + @Autowired + private ChatQueryDOMapper chatQueryDOMapper; - private final ChatParseMapper chatParseMapper; + @Autowired + private ChatParseMapper chatParseMapper; - private final ShowCaseCustomMapper showCaseCustomMapper; - - public ChatQueryRepositoryImpl(ChatQueryDOMapper chatQueryDOMapper, - ChatParseMapper chatParseMapper, - ShowCaseCustomMapper showCaseCustomMapper) { - this.chatQueryDOMapper = chatQueryDOMapper; - this.chatParseMapper = chatParseMapper; - this.showCaseCustomMapper = showCaseCustomMapper; - } + @Autowired + private ShowCaseCustomMapper showCaseCustomMapper; @Override public PageInfo getChatQuery(PageQueryInfoReq pageQueryInfoReq, Long chatId) { - ChatQueryDOExample example = new ChatQueryDOExample(); - example.setOrderByClause("question_id desc"); - Criteria criteria = example.createCriteria(); + QueryWrapper queryWrapper = new QueryWrapper<>(); if (chatId != null) { - criteria.andChatIdEqualTo(chatId); + queryWrapper.lambda().eq(ChatQueryDO::getChatId, chatId); } if (StringUtils.isNotBlank(pageQueryInfoReq.getUserName())) { - criteria.andUserNameEqualTo(pageQueryInfoReq.getUserName()); + queryWrapper.lambda().eq(ChatQueryDO::getUserName, pageQueryInfoReq.getUserName()); } if (!CollectionUtils.isEmpty(pageQueryInfoReq.getIds())) { - criteria.andQuestionIdIn(pageQueryInfoReq.getIds()); + queryWrapper.lambda().in(ChatQueryDO::getQuestionId, pageQueryInfoReq.getIds()); } + + queryWrapper.lambda().orderByDesc(ChatQueryDO::getQuestionId); + PageInfo pageInfo = PageHelper.startPage(pageQueryInfoReq.getCurrent(), pageQueryInfoReq.getPageSize()) - .doSelectPageInfo(() -> chatQueryDOMapper.selectByExampleWithBLOBs(example)); + .doSelectPageInfo(() -> chatQueryDOMapper.selectList(queryWrapper)); PageInfo chatQueryVOPageInfo = PageUtils.pageInfo2PageInfoVo(pageInfo); chatQueryVOPageInfo.setList( @@ -89,7 +87,7 @@ public QueryResp getChatQuery(Long queryId) { @Override public ChatQueryDO getChatQueryDO(Long queryId) { - return chatQueryDOMapper.selectByPrimaryKey(queryId); + return chatQueryDOMapper.selectById(queryId); } @Override @@ -110,6 +108,8 @@ private QueryResp convertTo(ChatQueryDO chatQueryDO) { } queryResp.setSimilarQueries(JSONObject.parseArray(chatQueryDO.getSimilarQueries(), SimilarQueryRecallResp.class)); + queryResp.setParseTimeCost(JsonUtil.toObject(chatQueryDO.getParseTimeCost(), + ParseTimeCostResp.class)); return queryResp; } @@ -161,23 +161,13 @@ public void getChatParseDO(ChatParseReq chatParseReq, Long queryId, } @Override - public ChatQueryDO getLastChatQuery(long chatId) { - ChatQueryDOExample example = new ChatQueryDOExample(); - example.setOrderByClause("question_id desc"); - example.setLimitEnd(1); - example.setLimitStart(0); - Criteria criteria = example.createCriteria(); - criteria.andChatIdEqualTo(chatId); - List chatQueryDOS = chatQueryDOMapper.selectByExampleWithBLOBs(example); - if (!CollectionUtils.isEmpty(chatQueryDOS)) { - return chatQueryDOS.get(0); - } - return null; + public int updateChatQuery(ChatQueryDO chatQueryDO) { + return chatQueryDOMapper.updateById(chatQueryDO); } @Override - public int updateChatQuery(ChatQueryDO chatQueryDO) { - return chatQueryDOMapper.updateByPrimaryKeyWithBLOBs(chatQueryDO); + public void updateChatQuery(ChatQueryDO chatQueryDO, UpdateWrapper updateWrapper) { + chatQueryDOMapper.update(chatQueryDO, updateWrapper); } public ChatParseDO getParseInfo(Long questionId, int parseId) { @@ -189,11 +179,6 @@ public List getParseInfoList(List questionIds) { return chatParseMapper.getParseInfoList(questionIds); } - @Override - public Boolean deleteChatQuery(Long questionId) { - return chatQueryDOMapper.deleteByPrimaryKey(questionId); - } - @Override public List getContextualParseInfo(Integer chatId) { List chatParseDOList = chatParseMapper.getContextualParseInfo(chatId); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java index 4a43012e65..b81973bf87 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java @@ -1,9 +1,11 @@ package com.tencent.supersonic.chat.server.processor.parse; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq; +import com.tencent.supersonic.chat.api.pojo.response.QueryResp; import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO; import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository; @@ -11,7 +13,6 @@ import com.tencent.supersonic.chat.server.util.SimilarQueryManager; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; -import com.tencent.supersonic.chat.api.pojo.response.QueryResp; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; @@ -82,7 +83,10 @@ private List getChatQuery(List queryIds) { private void updateChatQuery(ChatQueryDO chatQueryDO) { ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class); - chatQueryRepository.updateChatQuery(chatQueryDO); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("question_id", chatQueryDO.getQuestionId()); + updateWrapper.set("parse_time_cost", chatQueryDO.getSimilarQueries()); + chatQueryRepository.updateChatQuery(chatQueryDO, updateWrapper); } } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java index 938b632168..2ec36fdae2 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java @@ -41,6 +41,8 @@ public interface ChatManageService { int updateQuery(ChatQueryDO chatQueryDO); + void updateParseCostTime(ParseResp parseResp); + List batchAddParse(ChatParseReq chatParseReq, ParseResp parseResult); SemanticParseInfo getParseInfo(Long questionId, int parseId); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java index da1f57470a..0805056e5a 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java @@ -177,6 +177,13 @@ public int updateQuery(ChatQueryDO chatQueryDO) { return chatQueryRepository.updateChatQuery(chatQueryDO); } + @Override + public void updateParseCostTime(ParseResp parseResp) { + ChatQueryDO chatQueryDO = chatQueryRepository.getChatQueryDO(parseResp.getQueryId()); + chatQueryDO.setParseTimeCost(JsonUtil.toString(parseResp.getParseTimeCost())); + updateQuery(chatQueryDO); + } + @Override public List batchAddParse(ChatParseReq chatParseReq, ParseResp parseResult) { List candidateParses = parseResult.getSelectedParses(); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java index e3d07b9490..095723da4e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java @@ -76,6 +76,7 @@ public ParseResp performParsing(ChatParseReq chatParseReq) { chatParseReq.setQueryText(chatParseContext.getQueryText()); parseResp.setQueryText(chatParseContext.getQueryText()); chatManageService.batchAddParse(chatParseReq, parseResp); + chatManageService.updateParseCostTime(parseResp); return parseResp; } diff --git a/chat/server/src/main/resources/mapper/ChatQueryDOMapper.xml b/chat/server/src/main/resources/mapper/ChatQueryDOMapper.xml deleted file mode 100644 index d7ef77ab1f..0000000000 --- a/chat/server/src/main/resources/mapper/ChatQueryDOMapper.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - question_id, agent_id, create_time, user_name, query_state, chat_id, score, feedback - - - query_text, query_result, similar_queries - - - - - - - - delete from s2_chat_query - where question_id = #{questionId,jdbcType=BIGINT} - - - insert into s2_chat_query (agent_id, create_time, user_name, - query_state, chat_id, score, - 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}, - #{similarQueries, jdbcType=LONGVARCHAR} - ) - - - - update s2_chat_query - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - user_name = #{userName,jdbcType=VARCHAR}, - - - query_state = #{queryState,jdbcType=INTEGER}, - - - chat_id = #{chatId,jdbcType=BIGINT}, - - - score = #{score,jdbcType=INTEGER}, - - - feedback = #{feedback,jdbcType=VARCHAR}, - - - query_text = #{queryText,jdbcType=LONGVARCHAR}, - - - query_result = #{queryResult,jdbcType=LONGVARCHAR}, - - - similar_queries = #{similarQueries,jdbcType=LONGVARCHAR}, - - - where question_id = #{questionId,jdbcType=BIGINT} - - diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java index fbdd3e0a36..06293e0b27 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java @@ -165,7 +165,7 @@ private void addTags(ModelResp model) { public long addDataSet(DomainResp singerDomain, DomainResp singerModelSet, ModelResp singerModel) { DataSetReq dataSetReq = new DataSetReq(); - dataSetReq.setName("艺人库"); + dataSetReq.setName("艺人库数据集"); dataSetReq.setBizName("singer"); dataSetReq.setDomainId(singerDomain.getId()); dataSetReq.setDescription("包含艺人相关标签和指标信息"); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java index 5ea160c858..c7862cf4a4 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java @@ -92,7 +92,7 @@ public void doRun() { //create metrics and dimensions DimensionResp departmentDimension = getDimension("department", userModel); - MetricResp metricUv = addMetric_uv(userModel, departmentDimension); + MetricResp metricUv = addMetric_uv(pvUvModel, departmentDimension); MetricResp metricPv = getMetric("pv", pvUvModel); addMetric_pv_avg(metricPv, metricUv, departmentDimension, pvUvModel); @@ -463,7 +463,7 @@ public MetricResp addMetric_pv_avg(MetricResp metricPv, MetricResp metricUv, public DataSetResp addDataSet(DomainResp s2Domain, DomainResp s2ModelSet) { DataSetReq dataSetReq = new DataSetReq(); - dataSetReq.setName("超音数"); + dataSetReq.setName("超音数数据集"); dataSetReq.setBizName("s2"); dataSetReq.setDomainId(s2Domain.getId()); dataSetReq.setDescription("包含超音数访问统计相关的指标和维度等"); diff --git a/launchers/standalone/src/main/resources/config.update/sql-update.sql b/launchers/standalone/src/main/resources/config.update/sql-update.sql index 3805097855..8fa004ea98 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -316,4 +316,7 @@ alter table s2_agent add column `multi_turn_config` varchar(2000) COLLATE utf8_u alter table s2_model add column `ext` varchar(1000) DEFAULT NULL; --20240601 -alter table s2_sys_parameter rename to s2_system_config; \ No newline at end of file +alter table s2_sys_parameter rename to s2_system_config; + +--20240603 +alter table s2_chat_query add column `parse_time_cost` varchar(1024); \ No newline at end of file diff --git a/launchers/standalone/src/main/resources/db/schema-h2.sql b/launchers/standalone/src/main/resources/db/schema-h2.sql index fc4e06a17f..44c02570a2 100644 --- a/launchers/standalone/src/main/resources/db/schema-h2.sql +++ b/launchers/standalone/src/main/resources/db/schema-h2.sql @@ -38,6 +38,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_query` `score` int DEFAULT '0', `feedback` varchar(1024) DEFAULT '', `similar_queries` varchar(1024) DEFAULT '', + `parse_time_cost` varchar(1024) DEFAULT '', PRIMARY KEY (`question_id`) ); diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index 91c918d528..aa1f05753b 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -171,6 +171,7 @@ CREATE TABLE `s2_chat_query` `score` int(11) DEFAULT '0', `feedback` varchar(1024) DEFAULT '', `similar_queries` varchar(1024) DEFAULT '', + `parse_time_cost` varchar(1024) DEFAULT '', PRIMARY KEY (`question_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8; diff --git a/launchers/standalone/src/test/resources/db/schema-h2.sql b/launchers/standalone/src/test/resources/db/schema-h2.sql index 5500001095..7bbe98b654 100644 --- a/launchers/standalone/src/test/resources/db/schema-h2.sql +++ b/launchers/standalone/src/test/resources/db/schema-h2.sql @@ -38,6 +38,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_query` `score` int DEFAULT '0', `feedback` varchar(1024) DEFAULT '', `similar_queries` varchar(1024) DEFAULT '', + `parse_time_cost` varchar(1024) DEFAULT '', PRIMARY KEY (`question_id`) );