diff --git a/.gitignore b/.gitignore index d8ff41445..52487a1c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ log/ assembly/runtime/* **/dist/ *.umi/ -/assembly/deploy \ No newline at end of file +/assembly/deploy +.flattened-pom.xml \ No newline at end of file diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/application/SearchServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/application/SearchServiceImpl.java index 5ffd118de..da7288f7a 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/application/SearchServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/application/SearchServiceImpl.java @@ -11,7 +11,7 @@ import com.tencent.supersonic.chat.domain.pojo.search.DomainInfoStat; import com.tencent.supersonic.chat.domain.pojo.search.DomainWithSemanticType; import com.tencent.supersonic.chat.domain.pojo.search.MatchText; import com.tencent.supersonic.chat.domain.pojo.search.SearchResult; -import com.tencent.supersonic.chat.domain.pojo.semantic.DomainInfos; +import com.tencent.supersonic.chat.domain.pojo.chat.DomainInfos; import com.tencent.supersonic.chat.domain.service.ChatService; import com.tencent.supersonic.chat.domain.service.SearchService; import com.tencent.supersonic.chat.domain.utils.NatureConverter; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/application/knowledge/WordNatureService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/application/knowledge/WordNatureService.java index d6236ba29..0ebd41d90 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/application/knowledge/WordNatureService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/application/knowledge/WordNatureService.java @@ -4,7 +4,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.tencent.supersonic.chat.api.service.SemanticLayer; -import com.tencent.supersonic.chat.domain.pojo.semantic.DomainInfos; +import com.tencent.supersonic.chat.domain.pojo.chat.DomainInfos; import com.tencent.supersonic.chat.domain.utils.SchemaInfoConverter; import com.tencent.supersonic.common.nlp.ItemDO; import com.tencent.supersonic.common.nlp.NatureType; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/application/parser/DomainSemanticParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/application/parser/DomainSemanticParser.java index 565c397ef..10d5db455 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/application/parser/DomainSemanticParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/application/parser/DomainSemanticParser.java @@ -11,7 +11,7 @@ import com.tencent.supersonic.chat.api.service.SemanticParser; import com.tencent.supersonic.chat.api.service.SemanticQuery; import com.tencent.supersonic.chat.application.parser.resolver.DomainResolver; import com.tencent.supersonic.chat.application.parser.resolver.SemanticQueryResolver; -import com.tencent.supersonic.chat.domain.pojo.semantic.DomainInfos; +import com.tencent.supersonic.chat.domain.pojo.chat.DomainInfos; import com.tencent.supersonic.chat.domain.utils.ContextHelper; import com.tencent.supersonic.chat.domain.utils.SchemaInfoConverter; import com.tencent.supersonic.common.util.context.ContextUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DomainInfos.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/chat/DomainInfos.java similarity index 93% rename from chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DomainInfos.java rename to chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/chat/DomainInfos.java index c96a44758..d6936d1c5 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DomainInfos.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/chat/DomainInfos.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; +package com.tencent.supersonic.chat.domain.pojo.chat; import com.tencent.supersonic.common.nlp.ItemDO; import java.io.Serializable; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/AggregatorInfo.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/AggregatorInfo.java deleted file mode 100644 index c03b683dc..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/AggregatorInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -import java.io.Serializable; -import lombok.Data; - -@Data -public class AggregatorInfo implements Serializable { - - private String aggregator; - private String targetWord; - -} \ No newline at end of file diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DateTypeEnum.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DateTypeEnum.java deleted file mode 100644 index b299098bd..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/DateTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -public enum DateTypeEnum { - - - DAY("DAY", "天", "sys_imp_date"), - WEEK("WEEK", "周", "sys_imp_week"), - MONTH("MONTH", "月", "sys_imp_month"), - YEAR("YEAR", "年", "sys_imp_year"); - private String code; - - private String name; - - private String field; - - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getField() { - return field; - } - - DateTypeEnum(String code, String name, String field) { - this.code = code; - this.name = name; - this.field = field; - } - - public static DateTypeEnum fromCode(String code) { - for (DateTypeEnum dateTypeEnum : DateTypeEnum.values()) { - if (dateTypeEnum.getCode().equals(code)) { - return dateTypeEnum; - } - } - return DateTypeEnum.DAY; - } - - -} \ No newline at end of file diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ModeEnum.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ModeEnum.java deleted file mode 100644 index 808760333..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ModeEnum.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -public enum ModeEnum { - query, - interpret -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ParserSvrResponse.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ParserSvrResponse.java deleted file mode 100644 index 3bfb2d2f2..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/ParserSvrResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - - -import lombok.Data; - -@Data -public class ParserSvrResponse { - - private String code; - private String msg; - private T data; -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticDO.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticDO.java deleted file mode 100644 index 6309b07ba..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticDO.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -public class SemanticDO { - -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticText.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticText.java deleted file mode 100644 index af063c0b5..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/SemanticText.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -public class SemanticText implements Serializable { - - private LinkedHashSet metricList; - - private LinkedHashSet dimensionValues = new LinkedHashSet<>(); - private Map> filterDimensionValues = new HashMap<>(); - private AggregatorInfo aggregatorInfo; - private String startTime; - private String endTime; - private String timeWord; - private Integer classId; - private String className; -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseDetail.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseDetail.java deleted file mode 100644 index e4638ec97..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseDetail.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - - -import java.util.List; -import lombok.Data; - -@Data -public class TimeParseDetail { - - private String type; - private List time; -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseResult.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseResult.java deleted file mode 100644 index 08bbb37cf..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/semantic/TimeParseResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tencent.supersonic.chat.domain.pojo.semantic; - -import java.util.List; -import lombok.Data; - -@Data -public class TimeParseResult { - - private String text; - private List offset; - private TimeParseDetail detail; -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/SchemaInfoConverter.java b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/SchemaInfoConverter.java index cec704546..facfaef98 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/SchemaInfoConverter.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/SchemaInfoConverter.java @@ -6,7 +6,7 @@ import com.tencent.supersonic.chat.application.query.MetricDomain; import com.tencent.supersonic.chat.application.query.MetricFilter; import com.tencent.supersonic.chat.application.query.MetricGroupBy; import com.tencent.supersonic.chat.application.query.MetricOrderBy; -import com.tencent.supersonic.chat.domain.pojo.semantic.DomainInfos; +import com.tencent.supersonic.chat.domain.pojo.chat.DomainInfos; import com.tencent.supersonic.common.constant.Constants; import com.tencent.supersonic.common.enums.AggOperatorEnum; import com.tencent.supersonic.common.enums.AggregateTypeEnum; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java index 0e693f34a..ee6c23432 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java @@ -18,7 +18,7 @@ import com.tencent.supersonic.chat.domain.pojo.config.DefaultMetric; import com.tencent.supersonic.chat.domain.pojo.config.DefaultMetricInfo; import com.tencent.supersonic.chat.domain.pojo.config.EntityInternalDetail; import com.tencent.supersonic.chat.domain.pojo.config.EntityRichInfo; -import com.tencent.supersonic.chat.domain.pojo.semantic.DomainInfos; +import com.tencent.supersonic.chat.domain.pojo.chat.DomainInfos; import com.tencent.supersonic.chat.domain.service.ChatService; import com.tencent.supersonic.chat.domain.service.QueryService; import com.tencent.supersonic.chat.domain.utils.SchemaInfoConverter;