From 291c00749afd094ce7bec2d9f7083ec2c647f405 Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Wed, 22 Nov 2023 10:31:35 +0800
Subject: [PATCH] (improvement)(semantic) Support dimension search by tag or
 not, compatible with historical data (#414)

Co-authored-by: jolunoluo
---
 .../java/com/tencent/supersonic/ConfigureDemo.java    | 11 ++++++-----
 .../mapper/custom/DimensionDOCustomMapper.xml         |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java
index ac60b5922..6964309cb 100644
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java
@@ -8,7 +8,6 @@ import com.tencent.supersonic.chat.agent.AgentConfig;
 import com.tencent.supersonic.chat.agent.tool.AgentToolType;
 import com.tencent.supersonic.chat.agent.tool.LLMParserTool;
 import com.tencent.supersonic.chat.agent.tool.RuleQueryTool;
-import com.tencent.supersonic.common.pojo.SysParameter;
 import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq;
@@ -24,15 +23,13 @@ import com.tencent.supersonic.chat.plugin.PluginParseConfig;
 import com.tencent.supersonic.chat.query.plugin.ParamOption;
 import com.tencent.supersonic.chat.query.plugin.WebBase;
 import com.tencent.supersonic.chat.service.AgentService;
-import com.tencent.supersonic.common.service.SysParameterService;
 import com.tencent.supersonic.chat.service.ChatService;
 import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.chat.service.PluginService;
 import com.tencent.supersonic.chat.service.QueryService;
+import com.tencent.supersonic.common.pojo.SysParameter;
+import com.tencent.supersonic.common.service.SysParameterService;
 import com.tencent.supersonic.common.util.JsonUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,6 +38,10 @@ import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 @Component
 @Slf4j
 public class ConfigureDemo implements ApplicationListener<ApplicationReadyEvent> {
diff --git a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml b/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
index 29f996814..10848caba 100644
--- a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
+++ b/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
@@ -164,8 +164,11 @@
         <if test="datasourceId != null">
             and datasource_id = #{datasourceId}
         </if>
-        <if test="isTag != null">
-            and is_tag = #{isTag}
+        <if test="isTag != null and isTag == 1">
+            and is_tag = 1
+        </if>
+        <if test="isTag != null and isTag == 0">
+            and (is_tag = 0 or is_tag is null)
         </if>
     </select>