From 848b4a1e44a559a3a1dc2ffed36e4a3beb7949ed Mon Sep 17 00:00:00 2001 From: mislayming <18808893@qq.com> Date: Tue, 10 Dec 2024 19:14:32 +0800 Subject: [PATCH] =?UTF-8?q?(fix)(chat-api)=20=E5=B0=8F=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=80=E4=B8=8Blombok=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=81=BF=E5=85=8D=E9=AB=98=E7=89=88=E6=9C=AC?= =?UTF-8?q?json=E6=A1=86=E6=9E=B6=E6=97=A0=E6=B3=95=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=8C=96=E6=8A=A5=E9=94=99=20(#1951)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supersonic/chat/api/pojo/request/ChatConfigBaseReq.java | 1 - .../chat/api/pojo/request/ChatMemoryUpdateReq.java | 4 ++++ .../supersonic/chat/api/pojo/request/ItemNameVisibility.java | 1 - .../chat/api/pojo/request/ItemNameVisibilityInfo.java | 1 - .../supersonic/chat/api/pojo/request/ItemVisibility.java | 1 - .../chat/api/pojo/request/RecommendedQuestionReq.java | 1 - .../chat/api/pojo/response/DictLatestTaskResp.java | 1 - .../chat/api/pojo/response/RecommendQuestionResp.java | 2 ++ .../chat/api/pojo/response/SimilarQueryRecallResp.java | 4 ++++ .../chat/server/service/impl/ChatQueryServiceImpl.java | 5 +++-- 10 files changed, 13 insertions(+), 8 deletions(-) diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java index 1384f48b8..03c52119c 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java @@ -8,7 +8,6 @@ import java.util.List; /** extended information command about model */ @Data -@ToString public class ChatConfigBaseReq { private Long modelId; diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java index 9b68c10e5..7309e3275 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java @@ -4,11 +4,15 @@ import javax.validation.constraints.NotNull; import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult; import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class ChatMemoryUpdateReq { @NotNull(message = "id不可为空") diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibility.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibility.java index d4910839b..f377ad87f 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibility.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibility.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.ToString; @Data -@ToString public class ItemNameVisibility { private ItemNameVisibilityInfo aggVisibilityInfo; diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java index 0a5adeddb..d147766ac 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.List; @Data -@ToString public class ItemNameVisibilityInfo { /** invisible dimensions */ diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java index 8fac606d4..df3d2209f 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.List; @Data -@ToString public class ItemVisibility { /** invisible dimensions */ diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java index 9f552b002..30e761293 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java @@ -6,7 +6,6 @@ import lombok.NoArgsConstructor; import lombok.ToString; @Data -@ToString @AllArgsConstructor @NoArgsConstructor public class RecommendedQuestionReq { diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java index 8e04dcf5c..3e6e3519b 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java @@ -6,7 +6,6 @@ import lombok.ToString; import java.util.Date; -@ToString @Data public class DictLatestTaskResp { diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendQuestionResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendQuestionResp.java index 74dbda9d2..553bb82c4 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendQuestionResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendQuestionResp.java @@ -3,10 +3,12 @@ package com.tencent.supersonic.chat.api.pojo.response; import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @Data +@NoArgsConstructor @AllArgsConstructor public class RecommendQuestionResp { private Long modelId; diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java index 53f67e834..bd1f08683 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java @@ -1,10 +1,14 @@ package com.tencent.supersonic.chat.api.pojo.response; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class SimilarQueryRecallResp { private Long queryId; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java index 92a1b6a4d..c04a1c8f4 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java @@ -230,7 +230,8 @@ public class ChatQueryServiceImpl implements ChatQueryService { return queryResult; } - private boolean checkMetricReplace(ChatQueryDataReq chatQueryDataReq, SemanticParseInfo parseInfo) { + private boolean checkMetricReplace(ChatQueryDataReq chatQueryDataReq, + SemanticParseInfo parseInfo) { List oriFields = getFieldsFromSql(parseInfo); Set metrics = chatQueryDataReq.getMetrics(); if (CollectionUtils.isEmpty(oriFields) || CollectionUtils.isEmpty(metrics)) { @@ -242,7 +243,7 @@ public class ChatQueryServiceImpl implements ChatQueryService { } private String replaceFilters(ChatQueryDataReq queryData, SemanticParseInfo parseInfo, - DataSetSchema dataSetSchema) { + DataSetSchema dataSetSchema) { String correctorSql = parseInfo.getSqlInfo().getCorrectedS2SQL(); log.info("correctorSql before replacing:{}", correctorSql); // get where filter and having filter