diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java index 6748fdb..57e2961 100644 --- a/src/main/java/com/xly/service/XlyErpService.java +++ b/src/main/java/com/xly/service/XlyErpService.java @@ -684,17 +684,17 @@ public class XlyErpService { } //采用表格形式显示明细、...详情、...记录、...列表、...清单 String resultExplain = StrUtil.EMPTY; - if(retrunMarkdownType(userInput) ){ - List> titles = getMarkdownTableTitleWithSql(sqlResult); - resultExplain = buildMarkdownTableWithStream(sqlResult, titles); - }else { - resultExplain = aiAgent.explainSqlResult( - userId, - userInput, - cleanSql, - tableStruct, - resultJson); - } +// if(retrunMarkdownType(userInput) ){ +// List> titles = getMarkdownTableTitleWithSql(sqlResult); +// resultExplain = buildMarkdownTableWithStream(sqlResult, titles); +// }else { + resultExplain = aiAgent.explainSqlResult( + userId, + userInput, + cleanSql, + tableStruct, + resultJson); +// } return resultExplain; } diff --git a/src/main/java/com/xly/thread/AiUserAgentQuestionThread.java b/src/main/java/com/xly/thread/AiUserAgentQuestionThread.java index 93367fd..c892c0a 100644 --- a/src/main/java/com/xly/thread/AiUserAgentQuestionThread.java +++ b/src/main/java/com/xly/thread/AiUserAgentQuestionThread.java @@ -55,7 +55,7 @@ public class AiUserAgentQuestionThread implements Runnable { String sKey = sSceneId+"_"+sMethodId +"_"+sQuestion; // SqlValidateUtil.getsKey( sSceneId, sMethodId, SqlValidateUtil.getsQuestion(session.getSUserQuestionList())); //存入向量库 不包含where 条件 - if(!SqlWhereHelper.hasWhereCondition(sSqlContent)){ + if(!SqlWhereHelper.hasWhereButNoCompareOperators(sSqlContent)){ aiGlobalAgentQuestionSqlEmitterService.addAiGlobalAgentQuestionSqlEmitter(sKey,data,sQuestion,sSqlContent,cachType,"ai_global_agent_question_sql"); } //调用数据库插入数据库 diff --git a/src/main/java/com/xly/util/SqlWhereHelper.java b/src/main/java/com/xly/util/SqlWhereHelper.java index 9b5ee71..954e391 100644 --- a/src/main/java/com/xly/util/SqlWhereHelper.java +++ b/src/main/java/com/xly/util/SqlWhereHelper.java @@ -23,7 +23,7 @@ public class SqlWhereHelper { Statement statement = CCJSqlParserUtil.parse(sql); if (statement instanceof Select) { Select select = (Select) statement; - return select.getPlainSelect() != null && select.getPlainSelect().getWhere() != null; + return(select.getPlainSelect() != null && select.getPlainSelect().getWhere() != null); } if (statement instanceof Update) { Update update = (Update) statement; @@ -72,18 +72,18 @@ public class SqlWhereHelper { // 禁止出现的条件符号/关键字 boolean hasEq = upper.contains("="); - boolean hasGt = upper.contains(">"); - boolean hasLt = upper.contains("<"); + boolean hasGt = upper.contains(">") && !upper.contains("<>"); + boolean hasLt = upper.contains("<") && !upper.contains("<>"); boolean hasIn = upper.contains(" IN "); boolean hasExists = upper.contains(" EXISTS "); // 只要有任何一个,就返回 false if (hasEq || hasGt || hasLt || hasIn || hasExists) { - return false; + return true; } // 有 WHERE 且 无等值/区间/大小/IN/EXISTS → 返回 true - return true; + return false; } // ===================== 你原来的方法不动 =====================