From dfd25f7983de9a9d1edbf3936c44261b3b823721 Mon Sep 17 00:00:00 2001
From: daikon <1059907724@qq.com>
Date: Wed, 13 Mar 2024 11:11:55 +0800
Subject: [PATCH] fix TagConverter error (#812)

---
 .../supersonic/headless/server/utils/DictUtils.java      | 9 ---------
 .../supersonic/headless/server/utils/TagConverter.java   | 9 +++------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
index b56def8ac..7bbf66779 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
@@ -9,7 +9,6 @@ import com.tencent.supersonic.common.pojo.Filter;
 import com.tencent.supersonic.common.pojo.Order;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
-import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
@@ -59,14 +58,6 @@ import static com.tencent.supersonic.common.pojo.Constants.COMMA;
 import static com.tencent.supersonic.common.pojo.Constants.POUND;
 import static com.tencent.supersonic.common.pojo.Constants.SPACE;
 
-import com.tencent.supersonic.headless.server.service.TagMetaService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
 @Slf4j
 @Component
 public class DictUtils {
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagConverter.java
index 7ab966b26..096a54eb7 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagConverter.java
@@ -44,12 +44,7 @@ public class TagConverter {
             SemanticSchemaResp semanticSchemaResp) throws Exception {
         QueryStatement queryStatement = new QueryStatement();
         // covert to QueryReqConverter
-        QueryStructReq queryStructReq = new QueryStructReq();
-        BeanUtils.copyProperties(queryTagReq, queryStructReq);
-        // queryStructReq.setModelIds(queryTagReq.getModelIdSet());
-        if (!CollectionUtils.isEmpty(queryTagReq.getTagFilters())) {
-            queryStructReq.setDimensionFilters(queryTagReq.getTagFilters());
-        }
+        BeanUtils.copyProperties(queryStructReq.convert(), queryStructReq);
         QuerySqlReq querySqlReq = queryStructReq.convert();
         convert(querySqlReq, semanticSchemaResp, queryStatement, queryStructReq);
         QueryParam queryParam = new QueryParam();
@@ -57,6 +52,8 @@ public class TagConverter {
         queryStatement.setQueryParam(queryParam);
         queryStatement.setDataSetId(queryStructReq.getDataSetId());
         return queryStatement;
+
+
     }
 
     public void convert(QuerySqlReq querySqlReq,