From 41ad1ada6c7fa33abc3e2fe17e70901dc5e444e2 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Thu, 11 Jul 2024 20:49:25 +0800 Subject: [PATCH] (fix)(headless)Fix checkstyle issues following #1395. --- .../headless/chat/parser/llm/LLMRequestService.java | 9 ++++++--- .../chat/query/rule/detail/DetailSemanticQuery.java | 3 ++- .../chat/query/rule/metric/MetricSemanticQuery.java | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java index 9630d6e0b..bec25f4ee 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java @@ -8,6 +8,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; +import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig; import com.tencent.supersonic.headless.chat.ChatQueryContext; import com.tencent.supersonic.headless.chat.parser.ParserConfig; import com.tencent.supersonic.headless.chat.parser.SatisfactionChecker; @@ -81,9 +82,11 @@ public class LLMRequestService { llmSchema.setDomainName(dataSetIdToName.get(dataSetId)); List fieldNameList = getFieldNameList(queryCtx, dataSetId, llmParserConfig); - if(Objects.nonNull(semanticSchema.getDataSetSchemaMap()) && Objects.nonNull(semanticSchema.getDataSetSchemaMap().get(dataSetId))){ - TimeDefaultConfig timeDefaultConfig = semanticSchema.getDataSetSchemaMap().get(dataSetId).getTagTypeTimeDefaultConfig(); - if(!Objects.equals(timeDefaultConfig.getUnit(),-1)){ + if (Objects.nonNull(semanticSchema.getDataSetSchemaMap()) + && Objects.nonNull(semanticSchema.getDataSetSchemaMap().get(dataSetId))) { + TimeDefaultConfig timeDefaultConfig = semanticSchema.getDataSetSchemaMap() + .get(dataSetId).getTagTypeTimeDefaultConfig(); + if (!Objects.equals(timeDefaultConfig.getUnit(), -1)) { // 数据集查询设置 时间不为-1时才添加 '数据日期' 字段 fieldNameList.add(TimeDimensionEnum.DAY.getChName()); } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/detail/DetailSemanticQuery.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/detail/DetailSemanticQuery.java index 9128b9d79..8da42738a 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/detail/DetailSemanticQuery.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/detail/DetailSemanticQuery.java @@ -45,7 +45,8 @@ public abstract class DetailSemanticQuery extends RuleSemanticQuery { chatQueryContext.getSemanticSchema().getDataSetSchemaMap().get(parseInfo.getDataSetId()); TimeDefaultConfig timeDefaultConfig = dataSetSchema.getTagTypeTimeDefaultConfig(); DateConf dateInfo = new DateConf(); - if (Objects.nonNull(timeDefaultConfig) && Objects.nonNull(timeDefaultConfig.getUnit()) && timeDefaultConfig.getUnit() != -1) { + if (Objects.nonNull(timeDefaultConfig) && Objects.nonNull(timeDefaultConfig.getUnit()) + && timeDefaultConfig.getUnit() != -1) { int unit = timeDefaultConfig.getUnit(); String startDate = LocalDate.now().plusDays(-unit).toString(); String endDate = startDate; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/metric/MetricSemanticQuery.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/metric/MetricSemanticQuery.java index 17430c495..4e5dfce85 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/metric/MetricSemanticQuery.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/metric/MetricSemanticQuery.java @@ -45,7 +45,8 @@ public abstract class MetricSemanticQuery extends RuleSemanticQuery { TimeDefaultConfig timeDefaultConfig = dataSetSchema.getMetricTypeTimeDefaultConfig(); DateConf dateInfo = new DateConf(); //加上时间!=-1 判断 - if (Objects.nonNull(timeDefaultConfig) && Objects.nonNull(timeDefaultConfig.getUnit()) && timeDefaultConfig.getUnit() != -1) { + if (Objects.nonNull(timeDefaultConfig) && Objects.nonNull(timeDefaultConfig.getUnit()) + && timeDefaultConfig.getUnit() != -1) { int unit = timeDefaultConfig.getUnit(); String startDate = LocalDate.now().plusDays(-unit).toString(); String endDate = startDate;