fix(dimension): 修复维度值映射更新时技术名称和业务名称未同步的问题

- 在维度值映射更新逻辑中添加了技术名称字段的同步更新 - 在维度值映射更新逻辑中添加了业务名称字段的同步更新 - 确保维度值映射对象的所有关键属性都能正确更新
refactor(model): 移除模型关联检查中的外键验证逻辑
2026-04-18 12:24:21 +08:00 · 2026-04-09 16:24:46 +08:00 · 2026-04-09 12:15:16 +08:00 · 2026-04-07 09:51:25 +08:00 · 2026-04-03 11:59:17 +08:00 · 2026-04-01 14:24:31 +08:00
57 changed files with 839 additions and 305 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,113 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build Commands
+
+### Backend (Java/Maven)
+
+```bash
+# Clean build (skip tests)
+mvn clean package -DskipTests -Dspotless.skip=true
+
+# Run all tests
+mvn test
+
+# Run single test class
+mvn test -Dtest=ClassName
+
+# Full CI build
+mvn -B package --file pom.xml
+```
+
+**Requirements:** Java 21, Maven
+
+### Frontend (pnpm/React)
+
+```bash
+cd webapp
+
+# Install dependencies
+pnpm install
+
+# Start dev server (port 9000)
+pnpm dev
+
+# Production build
+pnpm build
+
+# Run tests
+pnpm test
+```
+
+**Requirements:** Node.js >=16, pnpm 9.12.3+
+
+### Quick Start
+
+```bash
+# Build full release
+./assembly/bin/supersonic-build.sh standalone
+
+# Start service
+./assembly/bin/supersonic-daemon.sh start
+
+# Stop service
+./assembly/bin/supersonic-daemon.sh stop
+```
+
+Visit http://localhost:9080 after startup.
+
+## Architecture Overview
+
+SuperSonic unifies **Chat BI** (LLM-powered) and **Headless BI** (semantic layer) paradigms.
+
+### Core Modules
+
+```
+supersonic/
+├── auth/           # Authentication & authorization (SPI-based)
+├── chat/           # Chat BI module - LLM-powered Q&A interface
+├── common/         # Shared utilities
+├── headless/       # Headless BI - semantic layer with open API
+├── launchers/      # Application entry points
+│   ├── standalone/ # Combined Chat + Headless (default)
+│   ├── chat/       # Chat-only service
+│   └── headless/   # Headless-only service
+└── webapp/         # Frontend React app (UmiJS 4 + Ant Design)
+```
+
+### Data Flow
+
+1. **Knowledge Base**: Extracts schema from semantic models, builds dictionary/index for schema mapping
+2. **Schema Mapper**: Identifies metrics/dimensions/entities/values in user queries
+3. **Semantic Parser**: Generates S2SQL (semantic SQL) using rule-based and LLM-based parsers
+4. **Semantic Corrector**: Validates and corrects semantic queries
+5. **Semantic Translator**: Converts S2SQL to executable SQL
+
+### Key Entry Points
+
+- `StandaloneLauncher.java` - Combined service with `scanBasePackages: ["com.tencent.supersonic", "dev.langchain4j"]`
+- `ChatLauncher.java` - Chat BI only
+- `HeadlessLauncher.java` - Headless BI only
+
+## Key Technologies
+
+**Backend:** Spring Boot 3.3.9, MyBatis-Plus 3.5.10.1, LangChain4j 0.36.2, JSqlParser 4.9, Calcite 1.38.0
+
+**Frontend:** React 18, UmiJS 4, Ant Design 5.17.4, ECharts 5.0.2, AntV G6/X6
+
+**Databases:** MySQL, PostgreSQL (with pgvector), H2, ClickHouse, StarRocks, Presto, Trino, DuckDB
+
+## Testing
+
+**Java tests:** JUnit 5, Mockito. Located in `src/test/java/` of each module.
+
+**Frontend tests:** Jest with Puppeteer environment in `webapp/packages/supersonic-fe/`
+
+**Evaluation scripts:** Python scripts in `evaluation/` directory for Text2SQL accuracy testing.
+
+## Related Documentation
+
+- [README.md](README.md) - English documentation
+- [README_CN.md](README_CN.md) - Chinese documentation
+- [Evaluation Guide](evaluation/README.md) - Text2SQL evaluation process
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
@@ -15,4 +15,6 @@ public class UserReq {

    @NotBlank(message = "password can not be null")
    private String newPassword;
+
+    private String role;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java
@@ -18,4 +18,5 @@ public class ChatExecuteReq {
    private int parseId;
    private String queryText;
    private boolean saveAnswer;
+    private boolean streamingResult;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryDeleteReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryDeleteReq.java
@@ -0,0 +1,19 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatMemoryDeleteReq {
+
+    private List<Long> ids;
+
+    private Integer agentId;
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
@@ -13,6 +13,7 @@ public class QueryResp {
    private Long questionId;
    private Date createTime;
    private Long chatId;
+    private Integer agentId;
    private Integer score;
    private String feedback;
    private String queryText;
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java
@@ -32,6 +32,7 @@ import dev.langchain4j.model.input.PromptTemplate;
 import dev.langchain4j.model.output.Response;
 import dev.langchain4j.provider.ModelProvider;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -171,10 +172,6 @@ public class NL2SQLParser implements ChatQueryParser {
            return;
        }

-        // derive mapping result of current question and parsing result of last question.
-        ChatLayerService chatLayerService = ContextUtils.getBean(ChatLayerService.class);
-        MapResp currentMapResult = chatLayerService.map(queryNLReq);
-
        List<QueryResp> historyQueries =
                getHistoryQueries(parseContext.getRequest().getChatId(), 1);
        if (historyQueries.isEmpty()) {
@@ -182,12 +179,18 @@ public class NL2SQLParser implements ChatQueryParser {
        }
        QueryResp lastQuery = historyQueries.get(0);
        SemanticParseInfo lastParseInfo = lastQuery.getParseInfos().get(0);
-        Long dataId = lastParseInfo.getDataSetId();
+        String histSQL = lastParseInfo.getSqlInfo().getCorrectedS2SQL();
+        if (StringUtils.isBlank(histSQL)) // 优化性能,如果问答不是chat bi 则无需重写，因为数据都不全
+            return;

+        // derive mapping result of current question and parsing result of last question.
+        ChatLayerService chatLayerService = ContextUtils.getBean(ChatLayerService.class);
+        MapResp currentMapResult = chatLayerService.map(queryNLReq); // 优化性能 ,只有满足条件才mapping
+
+        Long dataId = lastParseInfo.getDataSetId();
        String curtMapStr =
                generateSchemaPrompt(currentMapResult.getMapInfo().getMatchedElements(dataId));
        String histMapStr = generateSchemaPrompt(lastParseInfo.getElementMatches());
-        String histSQL = lastParseInfo.getSqlInfo().getCorrectedS2SQL();

        Map<String, Object> variables = new HashMap<>();
        variables.put("current_question", currentMapResult.getQueryText());
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatMemoryRepositoryImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatMemoryRepositoryImpl.java
@@ -35,9 +35,7 @@ public class ChatMemoryRepositoryImpl implements ChatMemoryRepository {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
-        for (Long id : ids) {
-            chatMemoryMapper.deleteById(id);
-        }
+        chatMemoryMapper.deleteByIds(ids);
    }

    @Override
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DataInterpretProcessor.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DataInterpretProcessor.java
@@ -1,13 +1,20 @@
 package com.tencent.supersonic.chat.server.processor.execute;

+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.agent.Agent;
+import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO;
+import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.common.pojo.ChatApp;
 import com.tencent.supersonic.common.pojo.enums.AppModule;
 import com.tencent.supersonic.common.util.ChatAppManager;
+import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.model.StreamingResponseHandler;
 import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.input.Prompt;
 import dev.langchain4j.model.input.PromptTemplate;
 import dev.langchain4j.model.output.Response;
@@ -24,9 +31,11 @@ import java.util.Objects;
 * DataInterpretProcessor interprets query result to make it more readable to the users.
 */
 public class DataInterpretProcessor implements ExecuteResultProcessor {
-
+    public static String tip = "AI 回答中...\r\n";
    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");

+    private static Map<Long, StringBuffer> resultCache = new HashMap<>();
+
    public static final String APP_KEY = "DATA_INTERPRETER";
    private static final String INSTRUCTION = ""
            + "#Role: You are a data expert who communicates with business users everyday."
@@ -41,6 +50,16 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
                .appModule(AppModule.CHAT).description("通过大模型对结果数据做提炼总结").enable(false).build());
    }

+    public static String getTextSummary(Long queryId) {
+        if (resultCache.get(queryId) != null) {
+            return resultCache.get(queryId).toString();
+        }
+        return "";
+    }
+
+    public static Map<Long, StringBuffer> getResultCache() {
+        return resultCache;
+    }

    @Override
    public boolean accept(ExecuteContext executeContext) {
@@ -71,14 +90,49 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
        variable.put("data", queryResult.getTextResult());

        Prompt prompt = PromptTemplate.from(chatApp.getPrompt()).apply(variable);
-        ChatLanguageModel chatLanguageModel =
-                ModelProvider.getChatModel(chatApp.getChatModelConfig());
-        Response<AiMessage> response = chatLanguageModel.generate(prompt.toUserMessage());
-        String anwser = response.content().text();
-        keyPipelineLog.info("DataInterpretProcessor modelReq:\n{} \nmodelResp:\n{}", prompt.text(),
-                anwser);
-        if (StringUtils.isNotBlank(anwser)) {
-            queryResult.setTextSummary(anwser);
+        if (executeContext.getRequest().isStreamingResult()) {
+            StreamingChatLanguageModel chatLanguageModel =
+                    ModelProvider.getChatStreamingModel(chatApp.getChatModelConfig());
+            final Long queryId = executeContext.getRequest().getQueryId();
+            resultCache.put(queryId, new StringBuffer(tip));
+            chatLanguageModel.generate(prompt.toUserMessage(),
+                    new StreamingResponseHandler<AiMessage>() {
+                        @Override
+                        public void onNext(String token) {
+                            resultCache.get(queryId).append(token);
+                        }
+
+                        @Override
+                        public void onComplete(Response<AiMessage> response) {
+                            ChatQueryRepository chatQueryRepository =
+                                    ContextUtils.getBean(ChatQueryRepository.class);
+                            ChatQueryDO chatQueryDO = chatQueryRepository.getChatQueryDO(queryId);
+                            JSONObject queryResult = JSON.parseObject(chatQueryDO.getQueryResult());
+                            queryResult.put("textSummary",
+                                    resultCache.get(queryId).toString().substring(tip.length()));
+                            chatQueryDO.setQueryResult(queryResult.toJSONString());
+                            chatQueryRepository.updateChatQuery(chatQueryDO);
+                            resultCache.remove(queryId);
+                        }
+
+                        @Override
+                        public void onError(Throwable error) {
+                            error.printStackTrace();
+                            resultCache.remove(queryId);
+                        }
+                    });
+        } else {
+            ChatLanguageModel chatLanguageModel =
+                    ModelProvider.getChatModel(chatApp.getChatModelConfig());
+            Response<AiMessage> response = chatLanguageModel.generate(prompt.toUserMessage());
+            String anwser = response.content().text();
+            keyPipelineLog.info("DataInterpretProcessor modelReq:\n{} \nmodelResp:\n{}",
+                    prompt.text(), anwser);
+            if (StringUtils.isNotBlank(anwser)) {
+                queryResult.setTextSummary(anwser);
+            }
        }
+
+
    }
 }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java
@@ -5,6 +5,7 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatQueryDataReq;
 import com.tencent.supersonic.chat.api.pojo.response.ChatParseResp;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
@@ -50,6 +51,14 @@ public class ChatQueryController {
        return chatQueryService.execute(chatExecuteReq);
    }

+    @PostMapping("getExecuteSummary")
+    public Object getExecuteSummary(@RequestBody ChatExecuteReq chatExecuteReq,
+            HttpServletRequest request, HttpServletResponse response) {
+        chatExecuteReq.setUser(UserHolder.findUser(request, response));
+        QueryResult res = chatQueryService.getTextSummary(chatExecuteReq);
+        return res;
+    }
+
    @PostMapping("/")
    public Object query(@RequestBody ChatParseReq chatParseReq, HttpServletRequest request,
            HttpServletResponse response) throws Exception {
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java
@@ -4,12 +4,12 @@ import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryCreateReq;
+import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryDeleteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageMemoryReq;
 import com.tencent.supersonic.chat.server.pojo.ChatMemory;
 import com.tencent.supersonic.chat.server.service.MemoryService;
 import com.tencent.supersonic.common.pojo.User;
-import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +53,10 @@ public class MemoryController {
    }

    @PostMapping("batchDelete")
-    public Boolean batchDelete(@RequestBody MetaBatchReq metaBatchReq) {
-        memoryService.batchDelete(metaBatchReq.getIds());
+    public Boolean deleteMemory(@RequestBody ChatMemoryDeleteReq chatMemoryDeleteReq,
+            HttpServletRequest request, HttpServletResponse response) {
+        User user = UserHolder.findUser(request, response);
+        memoryService.batchDelete(chatMemoryDeleteReq, user);
        return true;
    }
 }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java
@@ -35,6 +35,8 @@ public interface ChatManageService {

    QueryResp getChatQuery(Long queryId);

+    ChatQueryDO getChatQueryDO(Long queryId);
+
    List<QueryResp> getChatQueries(Integer chatId);

    ShowCaseResp queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId);
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java
@@ -19,6 +19,8 @@ public interface ChatQueryService {

    QueryResult execute(ChatExecuteReq chatExecuteReq) throws Exception;

+    QueryResult getTextSummary(ChatExecuteReq chatExecuteReq);
+
    QueryResult parseAndExecute(ChatParseReq chatParseReq);

    Object queryData(ChatQueryDataReq chatQueryDataReq, User user) throws Exception;
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java
@@ -1,6 +1,7 @@
 package com.tencent.supersonic.chat.server.service;

 import com.github.pagehelper.PageInfo;
+import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryDeleteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageMemoryReq;
@@ -14,7 +15,7 @@ public interface MemoryService {

    void updateMemory(ChatMemoryUpdateReq chatMemoryUpdateReq, User user);

-    void batchDelete(List<Long> ids);
+    void batchDelete(ChatMemoryDeleteReq chatMemoryDeleteReq, User user);

    PageInfo<ChatMemory> pageMemories(PageMemoryReq pageMemoryReq);

--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java
@@ -123,6 +123,11 @@ public class ChatManageServiceImpl implements ChatManageService {
        return chatQueryRepository.getChatQuery(queryId);
    }

+    @Override
+    public ChatQueryDO getChatQueryDO(Long queryId) {
+        return chatQueryRepository.getChatQueryDO(queryId);
+    }
+
    @Override
    public List<QueryResp> getChatQueries(Integer chatId) {
        List<QueryResp> queries = chatQueryRepository.getChatQueries(chatId);
--- 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
@@ -1,5 +1,6 @@
 package com.tencent.supersonic.chat.server.service.impl;

+import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
@@ -9,8 +10,10 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.executor.ChatQueryExecutor;
 import com.tencent.supersonic.chat.server.parser.ChatQueryParser;
+import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.chat.server.pojo.ParseContext;
+import com.tencent.supersonic.chat.server.processor.execute.DataInterpretProcessor;
 import com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor;
 import com.tencent.supersonic.chat.server.processor.parse.ParseResultProcessor;
 import com.tencent.supersonic.chat.server.service.AgentService;
@@ -18,7 +21,11 @@ import com.tencent.supersonic.chat.server.service.ChatManageService;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.chat.server.util.ComponentFactory;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
-import com.tencent.supersonic.common.jsqlparser.*;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.util.DateUtils;
@@ -44,7 +51,11 @@ import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
-import net.sf.jsqlparser.expression.operators.relational.*;
+import net.sf.jsqlparser.expression.operators.relational.ComparisonOperator;
+import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
+import net.sf.jsqlparser.expression.operators.relational.InExpression;
+import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
+import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.schema.Column;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -53,7 +64,14 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;

@Slf4j
@@ -110,6 +128,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
        }

        if (!parseContext.needFeedback()) {
+            parseContext.getResponse().getParseTimeCost().setParseTime(System.currentTimeMillis()
+                    - parseContext.getResponse().getParseTimeCost().getParseStartTime());
            chatManageService.batchAddParse(chatParseReq, parseContext.getResponse());
            chatManageService.updateParseCostTime(parseContext.getResponse());
        }
@@ -143,6 +163,21 @@ public class ChatQueryServiceImpl implements ChatQueryService {
        return queryResult;
    }

+    @Override
+    public QueryResult getTextSummary(ChatExecuteReq chatExecuteReq) {
+        String text = DataInterpretProcessor.getTextSummary(chatExecuteReq.getQueryId());
+        if (StringUtils.isNotBlank(text)) {
+            QueryResult res = new QueryResult();
+            res.setTextSummary(text);
+            res.setQueryId(chatExecuteReq.getQueryId());
+            return res;
+        } else {
+            ChatQueryDO chatQueryDo = chatManageService.getChatQueryDO(chatExecuteReq.getQueryId());
+            QueryResult res = JSON.parseObject(chatQueryDo.getQueryResult(), QueryResult.class);
+            return res;
+        }
+    }
+
    @Override
    public QueryResult parseAndExecute(ChatParseReq chatParseReq) {
        ChatParseResp parseResp = parse(chatParseReq);
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryDeleteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageMemoryReq;
@@ -26,6 +27,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -108,14 +110,21 @@ public class MemoryServiceImpl implements MemoryService, CommandLineRunner {
    }

    @Override
-    public void batchDelete(List<Long> ids) {
+    public void batchDelete(ChatMemoryDeleteReq chatMemoryDeleteReq, User user) {
        QueryWrapper<ChatMemoryDO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().in(ChatMemoryDO::getId, ids);
+        if (!CollectionUtils.isEmpty(chatMemoryDeleteReq.getIds())) {
+            queryWrapper.lambda().in(ChatMemoryDO::getId, chatMemoryDeleteReq.getIds());
+        }
+        if (chatMemoryDeleteReq.getAgentId() != null) {
+            queryWrapper.lambda().eq(ChatMemoryDO::getAgentId, chatMemoryDeleteReq.getAgentId());
+        }
        List<ChatMemoryDO> chatMemoryDOS = chatMemoryRepository.getMemories(queryWrapper);
+        List<Long> ids = new ArrayList<>();
        chatMemoryDOS.forEach(chatMemoryDO -> {
            if (MemoryStatus.ENABLED.toString().equals(chatMemoryDO.getStatus().trim())) {
                disableMemory(chatMemoryDO);
            }
+            ids.add(chatMemoryDO.getId());
        });
        chatMemoryRepository.batchDelete(ids);
    }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java
@@ -108,6 +108,7 @@ public class PluginServiceImpl implements PluginService {
        if (StringUtils.isNotBlank(pluginQueryReq.getCreatedBy())) {
            queryWrapper.lambda().eq(PluginDO::getCreatedBy, pluginQueryReq.getCreatedBy());
        }
+        queryWrapper.orderByAsc("name");
        List<PluginDO> pluginDOS = pluginRepository.query(queryWrapper);
        if (StringUtils.isNotBlank(pluginQueryReq.getPattern())) {
            pluginDOS = pluginDOS.stream()
--- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java
+++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java
@@ -118,22 +118,26 @@ public class SqlReplaceHelper {
    }

    public static void getFromSelect(FromItem fromItem, List<PlainSelect> plainSelectList) {
-        if (!(fromItem instanceof ParenthesedSelect)) {
+        if (!(fromItem instanceof ParenthesedSelect parenthesedSelect)) {
            return;
        }
-        ParenthesedSelect parenthesedSelect = (ParenthesedSelect) fromItem;
        Select select = parenthesedSelect.getSelect();
-        if (select instanceof PlainSelect) {
-            PlainSelect plainSelect = (PlainSelect) select;
+        if (select instanceof PlainSelect plainSelect) {
            plainSelectList.add(plainSelect);
            getFromSelect(plainSelect.getFromItem(), plainSelectList);
-        } else if (select instanceof SetOperationList) {
-            SetOperationList setOperationList = (SetOperationList) select;
+        } else if (select instanceof SetOperationList setOperationList) {
            if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
                setOperationList.getSelects().forEach(subSelectBody -> {
-                    PlainSelect subPlainSelect = (PlainSelect) subSelectBody;
-                    plainSelectList.add(subPlainSelect);
-                    getFromSelect(subPlainSelect.getFromItem(), plainSelectList);
+                    if (subSelectBody instanceof PlainSelect subPlainSelect) {
+                        plainSelectList.add(subPlainSelect);
+                        getFromSelect(subPlainSelect.getFromItem(), plainSelectList);
+                    } else if (subSelectBody instanceof ParenthesedSelect subParenthesedSelect) {
+                        Select innerSelect = subParenthesedSelect.getSelect();
+                        if (innerSelect instanceof PlainSelect innerPlainSelect) {
+                            plainSelectList.add(innerPlainSelect);
+                            getFromSelect(innerPlainSelect.getFromItem(), plainSelectList);
+                        }
+                    }
                });
            }
        }
@@ -188,8 +192,13 @@ public class SqlReplaceHelper {
                SetOperationList setOperationList = (SetOperationList) select;
                if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
                    setOperationList.getSelects().forEach(subSelectBody -> {
-                        PlainSelect subPlainSelect = (PlainSelect) subSelectBody;
-                        replaceFieldsInPlainOneSelect(fieldNameMap, exactReplace, subPlainSelect);
+                        if (subSelectBody instanceof PlainSelect) {
+                            PlainSelect subPlainSelect = (PlainSelect) subSelectBody;
+                            replaceFieldsInPlainOneSelect(fieldNameMap, exactReplace, subPlainSelect);
+                        } else if (subSelectBody instanceof ParenthesedSelect) {
+                            replaceFieldsInPlainOneSelect(fieldNameMap, exactReplace,
+                                    ((ParenthesedSelect) subSelectBody).getPlainSelect());
+                        }
                    });
                }
            }
--- a/common/src/main/java/com/tencent/supersonic/common/pojo/DataEvent.java
+++ b/common/src/main/java/com/tencent/supersonic/common/pojo/DataEvent.java
@@ -1,27 +1,26 @@
 package com.tencent.supersonic.common.pojo;

 import com.tencent.supersonic.common.pojo.enums.EventType;
+import lombok.Getter;
 import org.springframework.context.ApplicationEvent;

 import java.util.List;

+@Getter
 public class DataEvent extends ApplicationEvent {

-    private List<DataItem> dataItems;
+    private final List<DataItem> dataItems;

-    private EventType eventType;
+    private final EventType eventType;

-    public DataEvent(Object source, List<DataItem> dataItems, EventType eventType) {
+    private final String userName;
+
+    public DataEvent(Object source, List<DataItem> dataItems, EventType eventType,
+            String userName) {
        super(source);
        this.dataItems = dataItems;
        this.eventType = eventType;
+        this.userName = userName;
    }

-    public List<DataItem> getDataItems() {
-        return dataItems;
-    }
-
-    public EventType getEventType() {
-        return eventType;
-    }
 }
--- a/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java
+++ b/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java
@@ -15,5 +15,5 @@ public interface ChatModelService {

    ChatModel updateChatModel(ChatModel chatModel, User user);

-    void deleteChatModel(Integer id);
+    void deleteChatModel(Integer id, User user);
 }
--- a/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java
+++ b/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java
@@ -79,7 +79,12 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
    }

    @Override
-    public void deleteChatModel(Integer id) {
+    public void deleteChatModel(Integer id, User user) {
+        ChatModel chatModel = getChatModel(id);
+        if (!checkAdminPermission(user, chatModel)) {
+            throw new RuntimeException("没有权限删除该大模型");
+        }
+
        removeById(id);
    }

@@ -103,4 +108,13 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
        chatModelDO.setConfig(JsonUtil.toString(chatModel.getConfig()));
        return chatModelDO;
    }
+
+    private boolean checkAdminPermission(User user, ChatModel chatModel) {
+        String admin = chatModel.getAdmin();
+        if (user.isSuperAdmin()) {
+            return true;
+        }
+        return admin != null && admin.equals(user.getName())
+                || chatModel.getCreatedBy().equals(user.getName());
+    }
 }
--- a/common/src/main/java/com/tencent/supersonic/common/service/impl/SystemConfigServiceImpl.java
+++ b/common/src/main/java/com/tencent/supersonic/common/service/impl/SystemConfigServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils;

 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;

@Service
 public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigMapper, SystemConfigDO>
@@ -38,8 +39,8 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigMapper, Sys
        return systemConfigDb;
    }

-    private SystemConfig getSystemConfigFromDB() {
-        List<SystemConfigDO> list = list();
+    private SystemConfig getSystemConfigFromDB() { // 加上id ，如果有多条记录，会出错
+        List<SystemConfigDO> list = this.lambdaQuery().eq(SystemConfigDO::getId, 1).list();
        if (CollectionUtils.isEmpty(list)) {
            SystemConfig systemConfig = new SystemConfig();
            systemConfig.setId(1);
--- a/common/src/main/java/dev/langchain4j/provider/DifyModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/DifyModelFactory.java
@@ -7,6 +7,7 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.dify.DifyAiChatModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;

@@ -25,6 +26,11 @@ public class DifyModelFactory implements ModelFactory, InitializingBean {
                .modelName(modelConfig.getModelName()).timeOut(modelConfig.getTimeOut()).build();
    }

+    @Override
+    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
+        throw new RuntimeException("待开发");
+    }
+
    @Override
    public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModelConfig) {
        return OpenAiEmbeddingModel.builder().baseUrl(embeddingModelConfig.getBaseUrl())
--- a/common/src/main/java/dev/langchain4j/provider/InMemoryModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/InMemoryModelFactory.java
@@ -5,6 +5,7 @@ import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.embedding.S2OnnxEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
@@ -35,6 +36,11 @@ public class InMemoryModelFactory implements ModelFactory, InitializingBean {
        return EmbeddingModelConstant.BGE_SMALL_ZH_MODEL;
    }

+    @Override
+    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
+        throw new RuntimeException("待开发");
+    }
+
    @Override
    public void afterPropertiesSet() {
        ModelProvider.add(PROVIDER, this);
--- a/common/src/main/java/dev/langchain4j/provider/LocalAiModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/LocalAiModelFactory.java
@@ -6,6 +6,7 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.localai.LocalAiChatModel;
 import dev.langchain4j.model.localai.LocalAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;

@@ -27,6 +28,11 @@ public class LocalAiModelFactory implements ModelFactory, InitializingBean {
                .build();
    }

+    @Override
+    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
+        throw new RuntimeException("待开发");
+    }
+
    @Override
    public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel) {
        return LocalAiEmbeddingModel.builder().baseUrl(embeddingModel.getBaseUrl())
--- a/common/src/main/java/dev/langchain4j/provider/ModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/ModelFactory.java
@@ -4,9 +4,12 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;

 public interface ModelFactory {
    ChatLanguageModel createChatModel(ChatModelConfig modelConfig);

+    OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig);
+
    EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel);
 }
--- a/common/src/main/java/dev/langchain4j/provider/ModelProvider.java
+++ b/common/src/main/java/dev/langchain4j/provider/ModelProvider.java
@@ -5,7 +5,9 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.apache.commons.lang3.StringUtils;

 import java.util.HashMap;
@@ -41,6 +43,20 @@ public class ModelProvider {
                "Unsupported ChatLanguageModel provider: " + modelConfig.getProvider());
    }

+    public static StreamingChatLanguageModel getChatStreamingModel(ChatModelConfig modelConfig) {
+        if (modelConfig == null || StringUtils.isBlank(modelConfig.getProvider())
+                || StringUtils.isBlank(modelConfig.getBaseUrl())) {
+            modelConfig = DEMO_CHAT_MODEL;
+        }
+        ModelFactory modelFactory = factories.get(modelConfig.getProvider().toUpperCase());
+        if (modelFactory != null) {
+            return modelFactory.createChatStreamingModel(modelConfig);
+        }
+
+        throw new RuntimeException(
+                "Unsupported ChatLanguageModel provider: " + modelConfig.getProvider());
+    }
+
    public static EmbeddingModel getEmbeddingModel() {
        return getEmbeddingModel(null);
    }
--- a/common/src/main/java/dev/langchain4j/provider/OllamaModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/OllamaModelFactory.java
@@ -6,6 +6,7 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.ollama.OllamaChatModel;
 import dev.langchain4j.model.ollama.OllamaEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;

@@ -28,6 +29,11 @@ public class OllamaModelFactory implements ModelFactory, InitializingBean {
                .logResponses(modelConfig.getLogResponses()).build();
    }

+    @Override
+    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
+        throw new RuntimeException("待开发");
+    }
+
    @Override
    public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModelConfig) {
        return OllamaEmbeddingModel.builder().baseUrl(embeddingModelConfig.getBaseUrl())
--- a/common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java
@@ -6,6 +6,7 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
 import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;

@@ -37,6 +38,16 @@ public class OpenAiModelFactory implements ModelFactory, InitializingBean {
        return openAiChatModelBuilder.build();
    }

+    @Override
+    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
+        return OpenAiStreamingChatModel.builder().baseUrl(modelConfig.getBaseUrl())
+                .modelName(modelConfig.getModelName()).apiKey(modelConfig.keyDecrypt())
+                .temperature(modelConfig.getTemperature()).topP(modelConfig.getTopP())
+                .timeout(Duration.ofSeconds(modelConfig.getTimeOut()))
+                .logRequests(modelConfig.getLogRequests())
+                .logResponses(modelConfig.getLogResponses()).build();
+    }
+
    @Override
    public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel) {
        return OpenAiEmbeddingModel.builder().baseUrl(embeddingModel.getBaseUrl())
--- a/common/src/main/java/dev/langchain4j/store/embedding/TextSegmentConvert.java
+++ b/common/src/main/java/dev/langchain4j/store/embedding/TextSegmentConvert.java
@@ -42,6 +42,6 @@ public class TextSegmentConvert {
        if (Objects.isNull(textSegment) || Objects.isNull(textSegment.metadata())) {
            return null;
        }
-        return textSegment.metadata().get(QUERY_ID);
+        return textSegment.metadata().getString(QUERY_ID);
    }
 }
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
@@ -12,4 +12,6 @@ public class DictSingleTaskReq {
    private TypeEnums type;
    @NotNull
    private Long itemId;
+    private String startDate;
+    private String endDate;
 }
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
@@ -4,6 +4,8 @@ import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

+import java.util.List;
+
 /**
 * @author: kanedai
 * @date: 2024/10/31
@@ -15,7 +17,7 @@ public class DimValueAliasReq {
    private Long id;

    /**
-     * alias为空代表删除 否则更新
+     * alias 为空代表删除 否则更新
     */
-    DimValueMap dimValueMaps;
+    private List<DimValueMap> dimValueMaps;
 }
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java
@@ -15,6 +15,7 @@ public class PageSchemaItemReq extends PageBaseReq {
    private String createdBy;
    private List<Long> domainIds = Lists.newArrayList();
    private List<Long> modelIds = Lists.newArrayList();
+    private Long dataSetId;
    private Integer sensitiveLevel;
    private Integer status;
    private String key;
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/KnowledgeBaseService.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/KnowledgeBaseService.java
@@ -8,43 +8,107 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;

@Service
@Slf4j
 public class KnowledgeBaseService {
-    private static volatile Map<Long, List<DictWord>> dimValueAliasMap = new HashMap<>();
+    private static final Map<Long, List<DictWord>> dimValueAliasMap = new ConcurrentHashMap<>();
+    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();

+    /**
+     * Get dimension value alias map (read-only).
+     *
+     * @return unmodifiable view of the map
+     */
    public static Map<Long, List<DictWord>> getDimValueAlias() {
-        return dimValueAliasMap;
+        return Collections.unmodifiableMap(dimValueAliasMap);
    }

+    /**
+     * Add dimension value aliases with deduplication. Thread-safe implementation using
+     * ConcurrentHashMap.
+     *
+     * @param dimId dimension ID
+     * @param newWords new words to add
+     * @return updated list of aliases for the dimension
+     */
    public static List<DictWord> addDimValueAlias(Long dimId, List<DictWord> newWords) {
-        List<DictWord> dimValueAlias =
-                dimValueAliasMap.containsKey(dimId) ? dimValueAliasMap.get(dimId)
-                        : new ArrayList<>();
-        Set<String> wordSet =
-                dimValueAlias
-                        .stream().map(word -> String.format("%s_%s_%s",
-                                word.getNatureWithFrequency(), word.getWord(), word.getAlias()))
-                        .collect(Collectors.toSet());
-        for (DictWord dictWord : newWords) {
-            String key = String.format("%s_%s_%s", dictWord.getNatureWithFrequency(),
-                    dictWord.getWord(), dictWord.getAlias());
-            if (!wordSet.contains(key)) {
-                dimValueAlias.add(dictWord);
-            }
+        if (dimId == null || CollectionUtils.isEmpty(newWords)) {
+            return dimValueAliasMap.get(dimId);
+        }
+
+        // Use computeIfAbsent and synchronized block for thread safety
+        synchronized (dimValueAliasMap) {
+            List<DictWord> dimValueAlias =
+                    dimValueAliasMap.computeIfAbsent(dimId, k -> new ArrayList<>());
+
+            // Build deduplication key set
+            Set<String> existingKeys = dimValueAlias.stream().map(word -> buildDedupKey(word))
+                    .collect(Collectors.toSet());
+
+            // Add new words with deduplication
+            for (DictWord dictWord : newWords) {
+                String key = buildDedupKey(dictWord);
+                if (!existingKeys.contains(key)) {
+                    dimValueAlias.add(dictWord);
+                    existingKeys.add(key);
+                }
+            }
+
+            return dimValueAlias;
        }
-        dimValueAliasMap.put(dimId, dimValueAlias);
-        return dimValueAlias;
    }

-    public void updateSemanticKnowledge(List<DictWord> natures) {
+    /**
+     * Remove dimension value aliases by dimension ID.
+     *
+     * @param dimId dimension ID to remove, or null to clear all
+     */
+    public static void removeDimValueAlias(Long dimId) {
+        if (dimId == null) {
+            dimValueAliasMap.clear();
+            log.info("Cleared all dimension value aliases");
+        } else {
+            dimValueAliasMap.remove(dimId);
+            log.info("Removed dimension value alias for dimId: {}", dimId);
+        }
+    }

+    /**
+     * Build deduplication key for DictWord.
+     *
+     * @param word the DictWord object
+     * @return deduplication key string
+     */
+    private static String buildDedupKey(DictWord word) {
+        return String.format("%s_%s_%s", word.getNatureWithFrequency(), word.getWord(),
+                word.getAlias());
+    }
+
+    /**
+     * Update semantic knowledge (incremental add, no clearing). Use this method to add new words
+     * without removing existing data.
+     *
+     * @param natures the words to add
+     */
+    public void updateSemanticKnowledge(List<DictWord> natures) {
+        lock.writeLock().lock();
+        try {
+            updateSemanticKnowledgeInternal(natures);
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    private void updateSemanticKnowledgeInternal(List<DictWord> natures) {
        List<DictWord> prefixes = natures.stream().filter(
                entry -> !entry.getNatureWithFrequency().contains(DictWordType.SUFFIX.getType()))
                .collect(Collectors.toList());
@@ -60,52 +124,82 @@ public class KnowledgeBaseService {
        SearchService.loadSuffix(suffixes);
    }

+    /**
+     * Reload all knowledge (full replacement with clearing). Use this method to rebuild the entire
+     * knowledge base.
+     *
+     * @param natures all words to load
+     */
    public void reloadAllData(List<DictWord> natures) {
-        // 1. reload custom knowledge
+        // 1. reload custom knowledge (executed outside lock to avoid long blocking)
        try {
            HanlpHelper.reloadCustomDictionary();
        } catch (Exception e) {
            log.error("reloadCustomDictionary error", e);
        }

-        // 2. update online knowledge
-        if (CollectionUtils.isNotEmpty(dimValueAliasMap)) {
-            for (Long dimId : dimValueAliasMap.keySet()) {
-                natures.addAll(dimValueAliasMap.get(dimId));
-            }
-        }
-        updateOnlineKnowledge(natures);
-    }
-
-    private void updateOnlineKnowledge(List<DictWord> natures) {
+        // 2. acquire write lock, clear trie and rebuild (short operation)
+        lock.writeLock().lock();
        try {
-            updateSemanticKnowledge(natures);
-        } catch (Exception e) {
-            log.error("updateSemanticKnowledge error", e);
+            SearchService.clear();
+
+            if (CollectionUtils.isNotEmpty(dimValueAliasMap)) {
+                for (Long dimId : dimValueAliasMap.keySet()) {
+                    natures.addAll(dimValueAliasMap.get(dimId));
+                }
+            }
+            updateSemanticKnowledgeInternal(natures);
+        } finally {
+            lock.writeLock().unlock();
        }
    }

    public List<S2Term> getTerms(String text, Map<Long, List<Long>> modelIdToDataSetIds) {
-        return HanlpHelper.getTerms(text, modelIdToDataSetIds);
+        lock.readLock().lock();
+        try {
+            return HanlpHelper.getTerms(text, modelIdToDataSetIds);
+        } finally {
+            lock.readLock().unlock();
+        }
    }

    public List<HanlpMapResult> prefixSearch(String key, int limit,
            Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        return prefixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        lock.readLock().lock();
+        try {
+            return prefixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        } finally {
+            lock.readLock().unlock();
+        }
    }

    public List<HanlpMapResult> prefixSearchByModel(String key, int limit,
            Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        return SearchService.prefixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        lock.readLock().lock();
+        try {
+            return SearchService.prefixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        } finally {
+            lock.readLock().unlock();
+        }
    }

    public List<HanlpMapResult> suffixSearch(String key, int limit,
            Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        return suffixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        lock.readLock().lock();
+        try {
+            return suffixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        } finally {
+            lock.readLock().unlock();
+        }
    }

    public List<HanlpMapResult> suffixSearchByModel(String key, int limit,
            Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        return SearchService.suffixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        lock.readLock().lock();
+        try {
+            return SearchService.suffixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
+        } finally {
+            lock.readLock().unlock();
+        }
    }
 }
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MultiCustomDictionary.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MultiCustomDictionary.java
@@ -117,9 +117,17 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {
                        dictWord.setAlias(word.toLowerCase());
                        String[] split = nature.split(DictWordType.NATURE_SPILT);
                        if (split.length >= 2) {
-                            Long dimId = Long.parseLong(
-                                    nature.split(DictWordType.NATURE_SPILT)[split.length - 1]);
-                            KnowledgeBaseService.addDimValueAlias(dimId, Arrays.asList(dictWord));
+                            try {
+                                Long dimId = Long.parseLong(
+                                        nature.split(DictWordType.NATURE_SPILT)[split.length - 1]);
+                                KnowledgeBaseService.addDimValueAlias(dimId,
+                                        Arrays.asList(dictWord));
+                            } catch (NumberFormatException e) {
+                                logger.warning(path + " : 非标准文件，不存入KnowledgeBaseService");
+                                return true;
+                            }
+
+
                        }
                    }
                }
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java
@@ -31,8 +31,8 @@ import java.util.stream.Collectors;
 public class SearchService {

    public static final int SEARCH_SIZE = 200;
-    private static BinTrie<List<String>> trie;
-    private static BinTrie<List<String>> suffixTrie;
+    private static volatile BinTrie<List<String>> trie;
+    private static volatile BinTrie<List<String>> suffixTrie;

    static {
        trie = new BinTrie<>();
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java
@@ -100,8 +100,6 @@ public class HanlpHelper {
            FileHelper.deleteCacheFile(HanLP.Config.CustomDictionaryPath);
            FileHelper.resetCustomPath(getDynamicCustomDictionary());
        }
-        // 3.clear trie
-        SearchService.clear();

        boolean reload = getDynamicCustomDictionary().reload();
        if (reload) {
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java
@@ -23,6 +23,7 @@ public class DbAdaptorFactory {
        dbAdaptorMap.put(EngineType.PRESTO.getName(), new PrestoAdaptor());
        dbAdaptorMap.put(EngineType.TRINO.getName(), new TrinoAdaptor());
        dbAdaptorMap.put(EngineType.ORACLE.getName(), new OracleAdaptor());
+        dbAdaptorMap.put(EngineType.TDW.getName(), new DefaultDbAdaptor());
    }

    public static DbAdaptor getEngineAdaptor(String engineType) {
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/DataModelNode.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/DataModelNode.java
@@ -43,14 +43,7 @@ public class DataModelNode extends SemanticNode {
            }
        } else if (dataModel.getModelDetail().getTableQuery() != null
                && !dataModel.getModelDetail().getTableQuery().isEmpty()) {
-            if (dataModel.getModelDetail().getDbType()
-                    .equalsIgnoreCase(EngineType.POSTGRESQL.getName())) {
-                String fullTableName = String.join(".public.",
-                        dataModel.getModelDetail().getTableQuery().split("\\."));
-                sqlTable = "SELECT * FROM " + fullTableName;
-            } else {
-                sqlTable = "SELECT * FROM " + dataModel.getModelDetail().getTableQuery();
-            }
+            sqlTable = "SELECT * FROM " + dataModel.getModelDetail().getTableQuery();
        }

        // String filterSql = dataModel.getFilterSql();
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java
@@ -123,7 +123,9 @@ public class S2SemanticLayerService implements SemanticLayerService {

            // 3 translate query
            QueryStatement queryStatement = buildQueryStatement(queryReq, user);
-            semanticTranslator.translate(queryStatement);
+            if (!queryStatement.isTranslated()) {
+                semanticTranslator.translate(queryStatement);
+            }

            // Check whether the dimensions of the metric drill-down are correct temporarily,
            // add the abstraction of a validator later.
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java
@@ -17,12 +17,11 @@ import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.utils.DictUtils;
 import com.xkzhangsan.time.utils.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;

-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java
@@ -109,7 +109,7 @@ public class MetricRepositoryImpl implements MetricRepository {
        if (StringUtils.isNotBlank(metricFilter.getCreatedBy())) {
            queryWrapper.lambda().eq(MetricDO::getCreatedBy, metricFilter.getCreatedBy());
        }
-        if (Objects.nonNull(metricFilter.getIsPublish()) && metricFilter.getIsPublish() == 1) {
+        if (Objects.nonNull(metricFilter.getIsPublish())) {
            queryWrapper.lambda().eq(MetricDO::getIsPublish, metricFilter.getIsPublish());
        }
        if (StringUtils.isNotBlank(metricFilter.getKey())) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
@@ -46,8 +46,10 @@ public class ChatModelController {
    }

    @DeleteMapping("/{id}")
-    public boolean deleteModel(@PathVariable("id") Integer id) {
-        chatModelService.deleteChatModel(id);
+    public boolean deleteModel(@PathVariable("id") Integer id,
+            HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
+        chatModelService.deleteChatModel(id, user);
        return true;
    }

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
@@ -64,8 +64,10 @@ public class DatabaseController {
    }

    @DeleteMapping("/{id}")
-    public boolean deleteDatabase(@PathVariable("id") Long id) {
-        databaseService.deleteDatabase(id);
+    public boolean deleteDatabase(@PathVariable("id") Long id, HttpServletRequest request,
+            HttpServletResponse response) {
+        User user = UserHolder.findUser(request, response);
+        databaseService.deleteDatabase(id, user);
        return true;
    }

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java
@@ -34,7 +34,7 @@ public interface DatabaseService {

    List<DatabaseResp> getDatabaseList(User user);

-    void deleteDatabase(Long databaseId);
+    void deleteDatabase(Long databaseId, User user);

    List<String> getCatalogs(Long id) throws SQLException;

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java
@@ -52,7 +52,7 @@ public interface DimensionService {

    List<DimValueMap> mockDimensionValueAlias(DimensionReq dimensionReq, User user);

-    void sendDimensionEventBatch(List<Long> modelIds, EventType eventType);
+    void sendDimensionEventBatch(List<Long> modelIds, EventType eventType, User user);

    DataEvent getAllDataEvents();

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java
@@ -70,7 +70,7 @@ public interface MetricService {

    MetricQueryDefaultConfig getMetricQueryDefaultConfig(Long metricId, User user);

-    void sendMetricEventBatch(List<Long> modelIds, EventType eventType);
+    void sendMetricEventBatch(List<Long> modelIds, EventType eventType, User user);

    List<MetricResp> queryMetrics(MetricsFilter metricsFilter);

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
@@ -138,7 +138,12 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
    }

    @Override
-    public void deleteDatabase(Long databaseId) {
+    public void deleteDatabase(Long databaseId, User user) {
+        DatabaseResp databaseResp = getDatabase(databaseId);
+        if (!checkAdminPermission(user, databaseResp)) {
+            throw new RuntimeException("没有权限删除该数据库");
+        }
+
        ModelFilter modelFilter = new ModelFilter();
        modelFilter.setDatabaseId(databaseId);
        modelFilter.setIncludesDetail(false);
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
@@ -8,7 +8,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.common.pojo.*;
+import com.tencent.supersonic.common.pojo.DataEvent;
+import com.tencent.supersonic.common.pojo.DataItem;
+import com.tencent.supersonic.common.pojo.ModelRela;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.EventType;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
@@ -22,14 +25,22 @@ import com.tencent.supersonic.headless.api.pojo.request.DimValueAliasReq;
 import com.tencent.supersonic.headless.api.pojo.request.DimensionReq;
 import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
 import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.pojo.response.*;
+import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
+import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DimensionDO;
 import com.tencent.supersonic.headless.server.persistence.mapper.DimensionDOMapper;
 import com.tencent.supersonic.headless.server.persistence.repository.DimensionRepository;
 import com.tencent.supersonic.headless.server.pojo.DimensionFilter;
 import com.tencent.supersonic.headless.server.pojo.DimensionsFilter;
 import com.tencent.supersonic.headless.server.pojo.ModelFilter;
-import com.tencent.supersonic.headless.server.service.*;
+import com.tencent.supersonic.headless.server.service.DataSetService;
+import com.tencent.supersonic.headless.server.service.DatabaseService;
+import com.tencent.supersonic.headless.server.service.DimensionService;
+import com.tencent.supersonic.headless.server.service.ModelRelaService;
+import com.tencent.supersonic.headless.server.service.ModelService;
 import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper;
 import com.tencent.supersonic.headless.server.utils.DimensionConverter;
 import com.tencent.supersonic.headless.server.utils.NameCheckUtils;
@@ -37,12 +48,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;

@Service
@@ -50,31 +66,31 @@ import java.util.stream.Collectors;
 public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, DimensionDO>
        implements DimensionService {

-    private DimensionRepository dimensionRepository;
+    private final DimensionRepository dimensionRepository;

-    private ModelService modelService;
+    private final ModelService modelService;

-    private AliasGenerateHelper aliasGenerateHelper;
+    private final AliasGenerateHelper aliasGenerateHelper;

-    private DatabaseService databaseService;
+    private final DatabaseService databaseService;

-    private ModelRelaService modelRelaService;
+    private final ModelRelaService modelRelaService;

-    private DataSetService dataSetService;
+    private final DataSetService dataSetService;

-
-    @Autowired
-    private ApplicationEventPublisher eventPublisher;
+    private final ApplicationEventPublisher eventPublisher;

    public DimensionServiceImpl(DimensionRepository dimensionRepository, ModelService modelService,
            AliasGenerateHelper aliasGenerateHelper, DatabaseService databaseService,
-            ModelRelaService modelRelaService, DataSetService dataSetService) {
+            ModelRelaService modelRelaService, DataSetService dataSetService,
+            ApplicationEventPublisher eventPublisher) {
        this.modelService = modelService;
        this.dimensionRepository = dimensionRepository;
        this.aliasGenerateHelper = aliasGenerateHelper;
        this.databaseService = databaseService;
        this.modelRelaService = modelRelaService;
        this.dataSetService = dataSetService;
+        this.eventPublisher = eventPublisher;
    }

    @Override
@@ -83,7 +99,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        dimensionReq.createdBy(user.getName());
        DimensionDO dimensionDO = DimensionConverter.convert2DimensionDO(dimensionReq);
        dimensionRepository.createDimension(dimensionDO);
-        sendEventBatch(Lists.newArrayList(dimensionDO), EventType.ADD);
+        sendEventBatch(Lists.newArrayList(dimensionDO), EventType.ADD, user);

        // should update modelDetail
        modelService.updateModelByDimAndMetric(dimensionReq.getModelId(),
@@ -101,29 +117,11 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                .collect(Collectors.toMap(DimensionResp::getBizName, a -> a, (k1, k2) -> k1));

        List<DimensionReq> dimensionToInsert = Lists.newArrayList();
-        List<DimensionReq> dimensionToUpdate = Lists.newArrayList();
-        List<Long> dimensionToDelete = Lists.newArrayList();

        // look for which dimension need to insert, update, delete
-        dimensionReqs.stream().forEach(dimension -> {
+        dimensionReqs.forEach(dimension -> {
            if (!bizNameMap.containsKey(dimension.getBizName())) {
                dimensionToInsert.add(dimension);
-            } else {
-                DimensionResp dimensionRespByBizName = bizNameMap.get(dimension.getBizName());
-                if (null != dimensionRespByBizName && isChange(dimension, dimensionRespByBizName)) {
-                    dimension.setId(dimensionRespByBizName.getId());
-                    dimension.updatedBy(user.getName());
-                    dimensionToUpdate.add(dimension);
-                }
-            }
-        });
-
-        // the bizNames from alter dimensions
-        List<String> bizNames =
-                dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
-        bizNameMap.keySet().forEach(bizNameInDb -> {
-            if (!bizNames.contains(bizNameInDb)) {
-                dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId());
            }
        });

@@ -132,16 +130,6 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
            createDimensionBatch(dimensionToInsert, user);
        }

-        // update
-        if (!CollectionUtils.isEmpty(dimensionToUpdate)) {
-            updateDimensionBatch(dimensionToUpdate, user);
-        }
-
-        // delete
-        if (!CollectionUtils.isEmpty(dimensionToDelete)) {
-            deleteDimensionBatch(dimensionToDelete, user);
-        }
-
    }

    @Override
@@ -154,7 +142,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        modelService.updateModelByDimAndMetric(dimensionReqs.get(0).getModelId(), dimensionReqs,
                null, user);

-        sendEventBatch(dimensionDOS, EventType.ADD);
+        sendEventBatch(dimensionDOS, EventType.ADD, user);
    }

    @Override
@@ -170,7 +158,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                Lists.newArrayList(dimensionReq), null, user);

        if (!oldName.equals(dimensionDO.getName())) {
-            sendEvent(getDataItem(dimensionDO), EventType.UPDATE);
+            sendEvent(getDataItem(dimensionDO), EventType.UPDATE, user.getName());
        }
    }

@@ -183,7 +171,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        // should update modelDetail as well
        modelService.updateModelByDimAndMetric(dimensionReqList.get(0).getModelId(),
                dimensionReqList, null, user);
-        sendEventBatch(dimensionDOS, EventType.UPDATE);
+        sendEventBatch(dimensionDOS, EventType.UPDATE, user);
    }

    @Override
@@ -205,9 +193,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        dimensionRepository.batchUpdateStatus(dimensionDOS);
        if (StatusEnum.OFFLINE.getCode().equals(metaBatchReq.getStatus())
                || StatusEnum.DELETED.getCode().equals(metaBatchReq.getStatus())) {
-            sendEventBatch(dimensionDOS, EventType.DELETE);
+            sendEventBatch(dimensionDOS, EventType.DELETE, user);
        } else if (StatusEnum.ONLINE.getCode().equals(metaBatchReq.getStatus())) {
-            sendEventBatch(dimensionDOS, EventType.ADD);
+            sendEventBatch(dimensionDOS, EventType.ADD, user);
        }
    }

@@ -240,7 +228,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        // should update modelDetail
        modelService.deleteModelDetailByDimAndMetric(dimensionDO.getModelId(),
                Lists.newArrayList(dimensionDO), null);
-        sendEventBatch(Lists.newArrayList(dimensionDO), EventType.DELETE);
+        sendEventBatch(Lists.newArrayList(dimensionDO), EventType.DELETE, user);
    }

    @Override
@@ -261,7 +249,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        // should update modelDetail
        modelService.deleteModelDetailByDimAndMetric(dimensionDOList.get(0).getModelId(),
                dimensionDOList, null);
-        sendEventBatch(dimensionDOList, EventType.DELETE);
+        sendEventBatch(dimensionDOList, EventType.DELETE, user);
    }

    @Override
@@ -462,22 +450,22 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
    }

    @Override
-    public void sendDimensionEventBatch(List<Long> modelIds, EventType eventType) {
+    public void sendDimensionEventBatch(List<Long> modelIds, EventType eventType, User user) {
        DimensionFilter dimensionFilter = new DimensionFilter();
        dimensionFilter.setModelIds(modelIds);
        List<DimensionDO> dimensionDOS = queryDimension(dimensionFilter);
-        sendEventBatch(dimensionDOS, eventType);
+        sendEventBatch(dimensionDOS, eventType, user);
    }

-    private void sendEventBatch(List<DimensionDO> dimensionDOS, EventType eventType) {
-        DataEvent dataEvent = getDataEvent(dimensionDOS, eventType);
+    private void sendEventBatch(List<DimensionDO> dimensionDOS, EventType eventType, User user) {
+        DataEvent dataEvent = getDataEvent(dimensionDOS, eventType, user.getName());
        eventPublisher.publishEvent(dataEvent);
    }

    public DataEvent getAllDataEvents() {
        DimensionFilter dimensionFilter = new DimensionFilter();
        List<DimensionDO> dimensionDOS = queryDimension(dimensionFilter);
-        return getDataEvent(dimensionDOS, EventType.ADD);
+        return getDataEvent(dimensionDOS, EventType.ADD, "");
    }

    @Override
@@ -487,31 +475,53 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        if (StringUtils.isNotEmpty(dimensionDO.getDimValueMaps())) {
            dimValueMapList = JsonUtil.toList(dimensionDO.getDimValueMaps(), DimValueMap.class);
        }
-        DimValueMap dimValueMaps = req.getDimValueMaps();
-        if (StringUtils.isEmpty(dimValueMaps.getTechName())) {
-            dimValueMaps.setTechName(dimValueMaps.getValue());
-        }
-        Map<String, DimValueMap> valeAndMapInfo = dimValueMapList.stream()
-                .collect(Collectors.toMap(DimValueMap::getValue, v -> v, (v1, v2) -> v2));
-        String value = dimValueMaps.getValue();
-        if (CollectionUtils.isEmpty(dimValueMaps.getAlias())) {
-            // 删除
-            dimValueMapList =
-                    dimValueMapList.stream().filter(map -> !map.getValue().equalsIgnoreCase(value))
-                            .collect(Collectors.toList());
-        } else {
-            // 新增
-            if (!valeAndMapInfo.keySet().contains(value)) {
-                dimValueMapList.add(dimValueMaps);
-            } else {
-                // 更新
-                dimValueMapList.stream().forEach(map -> {
-                    if (map.getValue().equalsIgnoreCase(value)) {
-                        map.setAlias(dimValueMaps.getAlias());
-                    }
-                });
+
+        // 预先处理请求列表，设置默认的 techName
+        for (DimValueMap dimValueMap : req.getDimValueMaps()) {
+            if (StringUtils.isEmpty(dimValueMap.getTechName())) {
+                dimValueMap.setTechName(dimValueMap.getValue());
            }
        }
+
+        // 构建现有数据的 Map，用于快速查找 (value -> DimValueMap)
+        Map<String, DimValueMap> existingMap = dimValueMapList.stream()
+                .collect(Collectors.toMap(DimValueMap::getValue, v -> v, (v1, v2) -> v2));
+
+        // 收集需要删除的 values（alias 为空的）
+        Set<String> valuesToDelete = req.getDimValueMaps().stream()
+                .filter(dimValueMap -> CollectionUtils.isEmpty(dimValueMap.getAlias()))
+                .map(DimValueMap::getValue).collect(Collectors.toSet());
+
+        // 一次性删除所有需要删除的数据
+        if (!valuesToDelete.isEmpty()) {
+            dimValueMapList =
+                    dimValueMapList.stream().filter(map -> !valuesToDelete.contains(map.getValue()))
+                            .collect(Collectors.toList());
+            // 同时从 existingMap 中移除
+            existingMap.keySet().removeAll(valuesToDelete);
+        }
+
+        // 处理新增和更新
+        for (DimValueMap dimValueMap : req.getDimValueMaps()) {
+            // 跳过需要删除的
+            if (CollectionUtils.isEmpty(dimValueMap.getAlias())) {
+                continue;
+            }
+
+            String value = dimValueMap.getValue();
+            if (!existingMap.containsKey(value)) {
+                // 新增
+                dimValueMapList.add(dimValueMap);
+                existingMap.put(value, dimValueMap);
+            } else {
+                // 更新 - 直接更新已存在的对象
+                DimValueMap existing = existingMap.get(value);
+                existing.setAlias(dimValueMap.getAlias());
+                existing.setTechName(dimValueMap.getTechName());
+                existing.setBizName(dimValueMap.getBizName());
+            }
+        }
+
        dimensionDO.setDimValueMaps(JsonUtil.toString(dimValueMapList));
        updateById(dimensionDO);
        return true;
@@ -529,14 +539,16 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                .domainId(dimensionResp.getDomainId().toString()).type(TypeEnums.DIMENSION).build();
    }

-    private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType) {
+    private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType,
+            String userName) {
        List<DataItem> dataItems = dimensionDOS.stream().map(this::getDataItem)
                .filter(Objects::nonNull).collect(Collectors.toList());
-        return new DataEvent(this, dataItems, eventType);
+        return new DataEvent(this, dataItems, eventType, userName);
    }

-    private void sendEvent(DataItem dataItem, EventType eventType) {
-        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType));
+    private void sendEvent(DataItem dataItem, EventType eventType, String userName) {
+        eventPublisher.publishEvent(
+                new DataEvent(this, Lists.newArrayList(dataItem), eventType, userName));
    }

    private boolean isChange(DimensionReq dimensionReq, DimensionResp dimensionResp) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
@@ -8,23 +8,61 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.tencent.supersonic.common.pojo.*;
-import com.tencent.supersonic.common.pojo.enums.*;
+import com.tencent.supersonic.common.pojo.Aggregator;
+import com.tencent.supersonic.common.pojo.DataEvent;
+import com.tencent.supersonic.common.pojo.DataItem;
+import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.common.pojo.Filter;
+import com.tencent.supersonic.common.pojo.User;
+import com.tencent.supersonic.common.pojo.enums.AuthType;
+import com.tencent.supersonic.common.pojo.enums.EventType;
+import com.tencent.supersonic.common.pojo.enums.QueryType;
+import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.util.BeanMapper;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.pojo.*;
-import com.tencent.supersonic.headless.api.pojo.enums.DimensionType;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.MetaFilter;
+import com.tencent.supersonic.headless.api.pojo.MetricParam;
+import com.tencent.supersonic.headless.api.pojo.MetricQueryDefaultConfig;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.MapModeEnum;
 import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
-import com.tencent.supersonic.headless.api.pojo.request.*;
-import com.tencent.supersonic.headless.api.pojo.response.*;
+import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
+import com.tencent.supersonic.headless.api.pojo.request.MetricBaseReq;
+import com.tencent.supersonic.headless.api.pojo.request.MetricReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMetricReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.DataSetMapInfo;
+import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.MapInfoResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
-import com.tencent.supersonic.headless.server.persistence.dataobject.*;
+import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO;
+import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO;
+import com.tencent.supersonic.headless.server.persistence.dataobject.MetricQueryDefaultConfigDO;
 import com.tencent.supersonic.headless.server.persistence.mapper.MetricDOMapper;
 import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository;
-import com.tencent.supersonic.headless.server.pojo.*;
-import com.tencent.supersonic.headless.server.service.*;
-import com.tencent.supersonic.headless.server.utils.*;
+import com.tencent.supersonic.headless.server.pojo.DimensionsFilter;
+import com.tencent.supersonic.headless.server.pojo.MetricFilter;
+import com.tencent.supersonic.headless.server.pojo.MetricsFilter;
+import com.tencent.supersonic.headless.server.pojo.ModelCluster;
+import com.tencent.supersonic.headless.server.pojo.ModelFilter;
+import com.tencent.supersonic.headless.server.service.CollectService;
+import com.tencent.supersonic.headless.server.service.DataSetService;
+import com.tencent.supersonic.headless.server.service.DimensionService;
+import com.tencent.supersonic.headless.server.service.MetricService;
+import com.tencent.supersonic.headless.server.service.ModelService;
+import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper;
+import com.tencent.supersonic.headless.server.utils.MetricCheckUtils;
+import com.tencent.supersonic.headless.server.utils.MetricConverter;
+import com.tencent.supersonic.headless.server.utils.ModelClusterBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -33,7 +71,18 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;

@Service
@@ -41,21 +90,21 @@ import java.util.stream.Collectors;
 public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        implements MetricService {

-    private MetricRepository metricRepository;
+    private final MetricRepository metricRepository;

-    private ModelService modelService;
+    private final ModelService modelService;

-    private DimensionService dimensionService;
+    private final DimensionService dimensionService;

-    private AliasGenerateHelper aliasGenerateHelper;
+    private final AliasGenerateHelper aliasGenerateHelper;

-    private CollectService collectService;
+    private final CollectService collectService;

-    private DataSetService dataSetService;
+    private final DataSetService dataSetService;

-    private ApplicationEventPublisher eventPublisher;
+    private final ApplicationEventPublisher eventPublisher;

-    private ChatLayerService chatLayerService;
+    private final ChatLayerService chatLayerService;

    public MetricServiceImpl(MetricRepository metricRepository, ModelService modelService,
            AliasGenerateHelper aliasGenerateHelper, CollectService collectService,
@@ -78,7 +127,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        metricReq.createdBy(user.getName());
        MetricDO metricDO = MetricConverter.convert2MetricDO(metricReq);
        metricRepository.createMetric(metricDO);
-        sendEventBatch(Lists.newArrayList(metricDO), EventType.ADD);
+        sendEventBatch(Lists.newArrayList(metricDO), EventType.ADD, user);
        // should update modelDetail as well
        modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
                Lists.newArrayList(metricReq), user);
@@ -97,7 +146,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
                user);

-        sendEventBatch(metricDOS, EventType.ADD);
+        sendEventBatch(metricDOS, EventType.ADD, user);
    }

    @Override
@@ -108,28 +157,9 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
                .collect(Collectors.toMap(MetricResp::getBizName, a -> a, (k1, k2) -> k1));

        List<MetricReq> metricToInsert = Lists.newArrayList();
-        List<MetricReq> metricToUpdate = Lists.newArrayList();
-        List<Long> metricToDelete = Lists.newArrayList();
-
-        metricReqs.stream().forEach(metric -> {
+        metricReqs.forEach(metric -> {
            if (!bizNameMap.containsKey(metric.getBizName())) {
                metricToInsert.add(metric);
-            } else {
-                MetricResp metricRespByBizName = bizNameMap.get(metric.getBizName());
-                if (null != metricRespByBizName && isChange(metric, metricRespByBizName)) {
-                    metric.setId(metricRespByBizName.getId());
-                    metric.updatedBy(user.getName());
-                    metricToUpdate.add(metric);
-                }
-            }
-        });
-
-        // the bizNames from alter dimensions
-        List<String> bizNames =
-                metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
-        bizNameMap.keySet().forEach(bizNameInDb -> {
-            if (!bizNames.contains(bizNameInDb)) {
-                metricToDelete.add(bizNameMap.get(bizNameInDb).getId());
            }
        });

@@ -138,16 +168,6 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
            createMetricBatch(metricToInsert, user);
        }

-        // update
-        if (!CollectionUtils.isEmpty(metricToUpdate)) {
-            updateMetricBatch(metricToUpdate, user);
-        }
-
-        // delete
-        if (!CollectionUtils.isEmpty(metricToDelete)) {
-            deleteMetricBatch(metricToDelete, user);
-        }
-
    }

    @Override
@@ -163,7 +183,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
            DataItem dataItem = getDataItem(metricDO);
            dataItem.setName(oldName);
            dataItem.setNewName(metricDO.getName());
-            sendEvent(dataItem, EventType.UPDATE);
+            sendEvent(dataItem, EventType.UPDATE, user);
        }
        // should update modelDetail as well
        modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
@@ -181,7 +201,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        // should update modelDetail as well
        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
                user);
-        sendEventBatch(metricDOS, EventType.UPDATE);
+        sendEventBatch(metricDOS, EventType.UPDATE, user);
    }


@@ -202,9 +222,9 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        metricRepository.batchUpdateStatus(metricDOS);
        if (StatusEnum.OFFLINE.getCode().equals(metaBatchReq.getStatus())
                || StatusEnum.DELETED.getCode().equals(metaBatchReq.getStatus())) {
-            sendEventBatch(metricDOS, EventType.DELETE);
+            sendEventBatch(metricDOS, EventType.DELETE, user);
        } else if (StatusEnum.ONLINE.getCode().equals(metaBatchReq.getStatus())) {
-            sendEventBatch(metricDOS, EventType.ADD);
+            sendEventBatch(metricDOS, EventType.ADD, user);
        }
    }

@@ -285,7 +305,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        // should update modelDetail
        modelService.deleteModelDetailByDimAndMetric(metricDO.getModelId(), null,
                Lists.newArrayList(metricDO));
-        sendEventBatch(Lists.newArrayList(metricDO), EventType.DELETE);
+        sendEventBatch(Lists.newArrayList(metricDO), EventType.DELETE, user);
    }

    @Override
@@ -306,7 +326,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        // should update modelDetail
        modelService.deleteModelDetailByDimAndMetric(metricDOList.get(0).getModelId(), null,
                metricDOList);
-        sendEventBatch(metricDOList, EventType.DELETE);
+        sendEventBatch(metricDOList, EventType.DELETE, user);
    }

    @Override
@@ -354,7 +374,15 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
        MetricFilter metricFilter = new MetricFilter();
        metricFilter.setUserName(user.getName());
        BeanUtils.copyProperties(pageMetricReq, metricFilter);
-        if (!CollectionUtils.isEmpty(pageMetricReq.getDomainIds())) {
+
+        // If dataSetId is provided, get models directly from the dataset
+        if (pageMetricReq.getDataSetId() != null) {
+            DataSetResp dataSetResp = dataSetService.getDataSet(pageMetricReq.getDataSetId());
+            if (dataSetResp != null) {
+                pageMetricReq.getModelIds().addAll(dataSetResp.getAllModels());
+            }
+        } else if (!CollectionUtils.isEmpty(pageMetricReq.getDomainIds())) {
+            // Only check domainIds when dataSetId is not provided
            List<ModelResp> modelResps =
                    modelService.getAllModelByDomainIds(pageMetricReq.getDomainIds());
            List<Long> modelIds =
@@ -661,11 +689,11 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
    }

    @Override
-    public void sendMetricEventBatch(List<Long> modelIds, EventType eventType) {
+    public void sendMetricEventBatch(List<Long> modelIds, EventType eventType, User user) {
        MetricFilter metricFilter = new MetricFilter();
        metricFilter.setModelIds(modelIds);
        List<MetricDO> metricDOS = queryMetric(metricFilter);
-        sendEventBatch(metricDOS, eventType);
+        sendEventBatch(metricDOS, eventType, user);
    }

    @Override
@@ -678,22 +706,23 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
    public DataEvent getDataEvent() {
        MetricsFilter metricsFilter = new MetricsFilter();
        List<MetricDO> metricDOS = metricRepository.getMetrics(metricsFilter);
-        return getDataEvent(metricDOS, EventType.ADD);
+        return getDataEvent(metricDOS, EventType.ADD, User.getDefaultUser());
    }

-    private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType) {
+    private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType, User user) {
        List<DataItem> dataItems = metricDOS.stream().map(this::getDataItem)
                .filter(Objects::nonNull).collect(Collectors.toList());
-        return new DataEvent(this, dataItems, eventType);
+        return new DataEvent(this, dataItems, eventType, user.getName());
    }

-    private void sendEventBatch(List<MetricDO> metricDOS, EventType eventType) {
-        DataEvent dataEvent = getDataEvent(metricDOS, eventType);
+    private void sendEventBatch(List<MetricDO> metricDOS, EventType eventType, User user) {
+        DataEvent dataEvent = getDataEvent(metricDOS, eventType, user);
        eventPublisher.publishEvent(dataEvent);
    }

-    private void sendEvent(DataItem dataItem, EventType eventType) {
-        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType));
+    private void sendEvent(DataItem dataItem, EventType eventType, User user) {
+        eventPublisher.publishEvent(
+                new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
    }

    private DataItem getDataItem(MetricDO metricDO) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java
@@ -47,22 +47,9 @@ public class ModelRelaServiceImpl extends ServiceImpl<ModelRelaDOMapper, ModelRe
    }

    private void check(ModelRela modelRela) {
-        ModelResp fromModel = modelService.getModel(modelRela.getFromModelId());
-        ModelResp toModel = modelService.getModel(modelRela.getToModelId());
        if (CollectionUtils.isEmpty(modelRela.getJoinConditions())) {
            throw new RuntimeException("关联关系不可为空");
        }
-        for (JoinCondition joinCondition : modelRela.getJoinConditions()) {
-            IdentifyType identifyTypeLeft = fromModel.getIdentifyType(joinCondition.getLeftField());
-            IdentifyType identifyTypeRight = toModel.getIdentifyType(joinCondition.getRightField());
-            if (IdentifyType.foreign.equals(identifyTypeLeft)
-                    || IdentifyType.foreign.equals(identifyTypeRight)) {
-                if (!IdentifyType.primary.equals(identifyTypeLeft)
-                        && !IdentifyType.primary.equals(identifyTypeRight)) {
-                    throw new RuntimeException("外键必须跟主键关联");
-                }
-            }
-        }
    }

    @Override
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
@@ -39,6 +39,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;

+import static com.tencent.supersonic.common.pojo.DimensionConstants.DIMENSION_TIME_FORMAT;
+
@Service
@Slf4j
 public class ModelServiceImpl implements ModelService {
@@ -95,7 +97,7 @@ public class ModelServiceImpl implements ModelService {
        // create or update metric
        List<MetricReq> metricReqs = ModelConverter.convertMetricList(modelDO);
        metricService.alterMetricBatch(metricReqs, modelDO.getId(), user);
-        sendEvent(modelDO, EventType.ADD);
+        sendEvent(modelDO, EventType.ADD, user);
        return ModelConverter.convert(modelDO);
    }

@@ -129,7 +131,7 @@ public class ModelServiceImpl implements ModelService {
        // create or update metric
        List<MetricReq> metricReqs = ModelConverter.convertMetricList(modelDO);
        metricService.alterMetricBatch(metricReqs, modelDO.getId(), user);
-        sendEvent(modelDO, EventType.UPDATE);
+        sendEvent(modelDO, EventType.UPDATE, user);
        return ModelConverter.convert(modelDO);
    }

@@ -507,14 +509,14 @@ public class ModelServiceImpl implements ModelService {
            if (StatusEnum.OFFLINE.getCode().equals(metaBatchReq.getStatus())
                    || StatusEnum.DELETED.getCode().equals(metaBatchReq.getStatus())) {
                metricService.sendMetricEventBatch(Lists.newArrayList(modelDO.getId()),
-                        EventType.DELETE);
+                        EventType.DELETE, user);
                dimensionService.sendDimensionEventBatch(Lists.newArrayList(modelDO.getId()),
-                        EventType.DELETE);
+                        EventType.DELETE, user);
            } else if (StatusEnum.ONLINE.getCode().equals(metaBatchReq.getStatus())) {
                metricService.sendMetricEventBatch(Lists.newArrayList(modelDO.getId()),
-                        EventType.ADD);
+                        EventType.ADD, user);
                dimensionService.sendDimensionEventBatch(Lists.newArrayList(modelDO.getId()),
-                        EventType.ADD);
+                        EventType.ADD, user);
            }
        }).collect(Collectors.toList());
        modelRepository.batchUpdate(modelDOS);
@@ -530,17 +532,23 @@ public class ModelServiceImpl implements ModelService {
                Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
                        dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
                        .findFirst();
+                String dateFormat = null;
+                if (dimensionReq.getExt().containsKey(DIMENSION_TIME_FORMAT)) {
+                    dateFormat = (String) dimensionReq.getExt().get(DIMENSION_TIME_FORMAT);
+                }
                if (dimOptional.isPresent()) {
                    Dimension dimension = dimOptional.get();
                    dimension.setExpr(dimensionReq.getExpr());
                    dimension.setName(dimensionReq.getName());
                    dimension.setType(DimensionType.valueOf(dimensionReq.getType()));
                    dimension.setDescription(dimensionReq.getDescription());
+                    dimension.setDateFormat(dateFormat);
                } else {
                    Dimension dimension = Dimension.builder().name(dimensionReq.getName())
                            .bizName(dimensionReq.getBizName()).expr(dimensionReq.getExpr())
                            .type(DimensionType.valueOf(dimensionReq.getType()))
-                            .description(dimensionReq.getDescription()).build();
+                            .dateFormat(dateFormat).description(dimensionReq.getDescription())
+                            .build();
                    modelDetail.getDimensions().add(dimension);
                }
            });
@@ -670,9 +678,10 @@ public class ModelServiceImpl implements ModelService {
        return false;
    }

-    private void sendEvent(ModelDO modelDO, EventType eventType) {
+    private void sendEvent(ModelDO modelDO, EventType eventType, User user) {
        DataItem dataItem = getDataItem(modelDO);
-        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType));
+        eventPublisher.publishEvent(
+                new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
    }

    private DataItem getDataItem(ModelDO modelDO) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java
@@ -413,11 +413,11 @@ public class SchemaServiceImpl implements SchemaService {
    public List<ItemResp> getDomainDataSetTree() {
        List<DomainResp> domainResps = domainService.getDomainList();
        List<ItemResp> itemResps = domainResps.stream().map(domain -> new ItemResp(domain.getId(),
-                domain.getParentId(), domain.getName(), TypeEnums.DOMAIN))
-                .collect(Collectors.toList());
+                domain.getParentId(), domain.getName(), TypeEnums.DOMAIN)).toList();
        Map<Long, ItemResp> itemRespMap =
                itemResps.stream().collect(Collectors.toMap(ItemResp::getId, item -> item));
-        List<DataSetResp> dataSetResps = dataSetService.getDataSetList(new MetaFilter());
+        List<DataSetResp> dataSetResps = dataSetService
+                .getDataSetList(MetaFilter.builder().status(StatusEnum.ONLINE.getCode()).build());
        for (DataSetResp dataSetResp : dataSetResps) {
            ItemResp itemResp = itemRespMap.get(dataSetResp.getDomainId());
            if (itemResp != null) {
--- 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
@@ -296,6 +296,8 @@ public class DictUtils {
        modelIds.add(dictItemResp.getModelId());
        QuerySqlReq querySqlReq = new QuerySqlReq();
        querySqlReq.setSql(sql);
+        // bypass semantic translation
+        querySqlReq.getSqlInfo().setQuerySQL(sql);
        querySqlReq.setNeedAuth(false);
        querySqlReq.setModelIds(modelIds);

@@ -445,14 +447,29 @@ public class DictUtils {
        if (DateConf.DateMode.ALL.equals(config.getDateConf().getDateMode())) {
            return "";
        }
+
        // 静态日期
        if (DateConf.DateMode.BETWEEN.equals(config.getDateConf().getDateMode())) {
+            String dateFormat = partitionTimeDimension.getDateFormat();
+            if (StringUtils.isEmpty(dateFormat)) {
+                dateFormat = "yyyy-MM-dd"; // 默认格式
+            }
+
+            // 格式化起止日期
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat);
+            String startDate =
+                    LocalDate.parse(config.getDateConf().getStartDate()).format(formatter);
+            String endDate = LocalDate.parse(config.getDateConf().getEndDate()).format(formatter);
+
            return String.format("( %s >= '%s' and %s <= '%s' )",
-                    config.getDateConf().getDateField(), config.getDateConf().getStartDate(),
-                    config.getDateConf().getDateField(), config.getDateConf().getEndDate());
+                    partitionTimeDimension.getBizName(), startDate,
+                    partitionTimeDimension.getBizName(), endDate);
        }
+
        // 动态日期
        if (DateConf.DateMode.RECENT.equals(config.getDateConf().getDateMode())) {
+            dictItemResp.getConfig().getDateConf()
+                    .setDateField(partitionTimeDimension.getBizName());
            return generateDictDateFilterRecent(dictItemResp);
        }

--- a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx
+++ b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx
@@ -10,7 +10,14 @@ import {
  SimilarQuestionType,
 } from '../../common/type';
 import { createContext, useEffect, useRef, useState } from 'react';
-import { chatExecute, chatParse, queryData, deleteQuery, switchEntity } from '../../service';
+import {
+  chatExecute,
+  chatParse,
+  queryData,
+  deleteQuery,
+  switchEntity,
+  getExecuteSummary,
+} from '../../service';
 import { PARSE_ERROR_TIP, PREFIX_CLS, SEARCH_EXCEPTION_TIP } from '../../common/constants';
 import { message, Spin } from 'antd';
 import IconFont from '../IconFont';
@@ -169,7 +176,7 @@ const ChatItem: React.FC<Props> = ({
      setExecuteLoading(true);
    }
    try {
-      const res: any = await chatExecute(msg, conversationId!, parseInfoValue, agentId);
+      const res: any = await chatExecute(msg, conversationId!, parseInfoValue, agentId, true);
      const valid = updateData(res);
      onMsgDataLoaded?.(
        {
@@ -180,6 +187,20 @@ const ChatItem: React.FC<Props> = ({
        valid,
        isRefresh
      );
+      const queryId = parseInfoValue.queryId; // 伪流式 大模型输出
+      if (queryId != undefined && res.data.queryState != 'INVALID') {
+        const getSummary = async (data: any, queryId: number) => {
+          const res2: any = await getExecuteSummary(queryId);
+          if (res2.data.queryMode == null) {
+            res2.data = { ...data, textSummary: res2.data.textSummary };
+            setData(res2.data);
+            setTimeout(() => getSummary(data, queryId), 500);
+          } else {
+            setData(res2.data);
+          }
+        };
+        setTimeout(() => getSummary(res.data, queryId), 500);
+      }
    } catch (e) {
      const tip = SEARCH_EXCEPTION_TIP;
      setExecuteTip(SEARCH_EXCEPTION_TIP);
@@ -423,6 +444,10 @@ const ChatItem: React.FC<Props> = ({
          return result;
        }, {});
      });
+      if (exportData.length === 0) {
+        message.error('该条消息暂不支持该操作');
+        return;
+      }
      exportCsvFile(exportData);
    }
  };
--- a/webapp/packages/chat-sdk/src/service/index.ts
+++ b/webapp/packages/chat-sdk/src/service/index.ts
@@ -79,7 +79,8 @@ export function chatExecute(
  queryText: string,
  chatId: number,
  parseInfo: ChatContextType,
-  agentId?: number
+  agentId?: number,
+  streamingResult?:boolean
 ) {
  return axios.post<MsgDataType>(`${prefix}/chat/query/execute`, {
    queryText,
@@ -87,6 +88,15 @@ export function chatExecute(
    chatId: chatId || DEFAULT_CHAT_ID,
    queryId: parseInfo.queryId,
    parseId: parseInfo.id,
+    streamingResult:streamingResult
+  });
+}
+
+export function getExecuteSummary(
+    queryId: number
+) {
+  return axios.post<MsgDataType>(`${prefix}/chat/query/getExecuteSummary`, {
+    queryId: queryId,
  });
 }

--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx
@@ -355,9 +355,11 @@ const DimensionValueSettingModal: React.FC<CreateFormProps> = ({
              onRecordSave={(record) => {
                modifyDimensionValue({
                  id: dimensionItem.id,
-                  dimValueMaps: {
-                    ...record,
-                  },
+                  dimValueMaps: [
+                    {
+                      ...record,
+                    },
+                  ],
                });
              }}
              hideCtrlBtn={['deleteBtn']}
Author	SHA1	Message	Date
jerryjzhang	0bbab5e7b1	fix(dimension): 修复维度值映射更新时技术名称和业务名称未同步的问题 - 在维度值映射更新逻辑中添加了技术名称字段的同步更新 - 在维度值映射更新逻辑中添加了业务名称字段的同步更新 - 确保维度值映射对象的所有关键属性都能正确更新	2026-04-09 16:24:46 +08:00
jerryjzhang	d373567cef	refactor(model): 移除模型关联检查中的外键验证逻辑 - 删除了 fromModel 和 toModel 的获取逻辑 - 移除了 JoinCondition 中外键与主键关联的验证规则 - 简化了 check 方法的实现，只保留关联条件非空检查	2026-04-09 12:15:16 +08:00
jerryjzhang	80a1f62d3f	feat(db): 添加 TDW 数据库适配器支持 Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details - 在 DbAdaptorFactory 中注册 TDW 引擎类型 - 为 TDW 引擎配置默认数据库适配器 - 扩展引擎适配器映射以包含 TDW 支持	2026-04-07 09:51:25 +08:00
jerryjzhang	4379af4bd4	refactor(common): 优化SQL解析器中的类型转换和嵌套查询处理 Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details - 使用模式匹配简化ParenthesedSelect类型的转换 - 改进SetOperationList中子查询的处理逻辑 - 增加对嵌套ParenthesedSelect的递归处理支持 - 优化字段替换功能以支持更复杂的查询结构 - 提高代码可读性和类型安全性	2026-04-03 11:59:17 +08:00
jerryjzhang	8a4bccab10	refactor(headless): 优化维度值映射处理逻辑并添加查询响应中的代理ID字段 Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details - 简化了维度值映射列表的删除操作代码结构 - 移除了不必要的空行以提高代码可读性 - 在查询响应对象中添加了agentId字段 - 优化了流式处理的链式调用方式 - 调整了数据集服务查询方法的参数构建方式	2026-04-01 14:24:31 +08:00
jerryjzhang	507af43b73	feat(headless): 优化维度值映射处理逻辑 Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details - 修改后端 DimensionServiceImpl 中维度值映射的处理方式，支持批量操作 - 将单个 DimValueMap 对象修改为 List<DimValueMap> 列表结构 - 优化了新增、更新和删除维度值映射的算法逻辑 - 前端 DimensionValueSettingModal 组件适配新的 API 接口格式 - 添加了预先处理请求列表的逻辑，设置默认的 techName 值 - 实现了批量删除和更新操作，提高处理效率	2026-03-25 08:49:55 +08:00
jerryjzhang	c1d50f978d	(opt)(headless)Only return ONLINE datasets in the domain dataset tree. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-03-09 20:22:56 +08:00
jerryjzhang	18ce934bba	(fix)(headless)Fix concurrent read/write search trie issue. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-03-03 18:03:55 +08:00
jerryjzhang	6fe0ebcb9d	[docs] Add CLAUDE.md for Claude Code guidance Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details Add CLAUDE.md file with build commands, architecture overview, and key technologies for future Claude Code instances.	2026-03-02 09:45:48 +08:00
jerryjzhang	77d8d63df7	(opt)(headless)Support querying metrics by dataSetId. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-21 17:00:29 +08:00
jerryjzhang	0876f5eae8	(opt)(headless)Dimension value loading could bypass semantic translation. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-21 08:19:57 +08:00
jerryjzhang	ddbaf53ad4	(opt)(headless)Use commons-lang3 StringUtils. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-20 17:04:28 +08:00
jerryjzhang	4c97d01eab	[fix](headless)Fix metric filtering issue. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-14 21:09:22 +08:00
jerryjzhang	008f1443cb	[fix](headless)Should format time range when loading dimension values. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-14 15:33:01 +08:00
jerryjzhang	29c1119ee2	[fix](headless)Time format of a dimension should be updated to modelDetail.	2026-02-14 15:21:05 +08:00
jerryjzhang	d658e437fb	[fix](headless)Use partition time field to load dimension values. [fix](headless)Use partition time field to load dimension values.	2026-02-14 14:50:26 +08:00
jerryjzhang	b6f561f18c	[fix](headless)Fix postgres schema issue. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2026-02-08 20:20:17 +08:00
jerryjzhang	593d26a072	[feature](auth)Add role to user registration. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-12-08 21:15:02 +08:00
jerryjzhang	9162b922c4	[opt](chat)ParseTime should span all parsers and processors. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-11-26 21:58:36 +08:00
jerryjzhang	1d9324f689	[opt](common)Do not use deprecated method.	2025-11-02 17:33:06 +08:00
jerryjzhang	6c5f8fce40	[opt](headless)Deletion of chat model and database should record user. Some checks failed supersonic CentOS CI / build (21) (push) Failing after 19s Details supersonic ubuntu CI / build (21) (push) Failing after 24s Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-10-22 19:17:30 +08:00
guilinlewis	04b1edb2e2	(improvement)(chat\|common\|headless\|webapp) 结果分析，改写伪流式输出，加快响应速度 (#2395 )	2025-10-22 15:37:50 +08:00
jerryjzhang	9857256488	[opt](headless)Model update should not delete/update metrics/dimensions, use dedicated metric/dimension management. Some checks failed supersonic CentOS CI / build (21) (push) Failing after 13s Details supersonic ubuntu CI / build (21) (push) Failing after 16s Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-10-22 12:03:09 +08:00
jerryjzhang	d695bed75d	[feature](headless)Add request user to data events. [feature](headless)Add request user to data events.	2025-10-22 08:43:33 +08:00
jerryjzhang	7490dabdc3	Merge remote-tracking branch 'origin/master' Some checks failed supersonic CentOS CI / build (21) (push) Failing after 1m45s Details supersonic ubuntu CI / build (21) (push) Failing after 37s Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-10-12 21:56:03 +08:00
jerryjzhang	fad28ee5ac	[feature](chat)Support delete all memory from the agent management.	2025-10-12 21:55:49 +08:00