diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java index 854ce0b..72e5748 100644 --- a/src/main/java/com/xly/service/XlyErpService.java +++ b/src/main/java/com/xly/service/XlyErpService.java @@ -308,7 +308,7 @@ public class XlyErpService { String sCleanSql = StrUtil.EMPTY; if(ObjectUtil.isEmpty(cachMap)){ //查询是否走向量库 还是数据库查询 - isAggregation = aiAgent.routeQuery(session.getUserId(), input); +// isAggregation = aiAgent.routeQuery(session.getUserId(), input); session.setDbCach("D"); bHasCach = false; }else{ @@ -317,14 +317,14 @@ public class XlyErpService { bHasCach = true; sCleanSql = ObjectUtil.isNotEmpty(cachMap.get("sSqlContent"))?cachMap.get("sSqlContent").toString() : StrUtil.EMPTY; } - if(!isAggregation){ - //获取常量库内容 - session.setDbType("X"); - sResponMessage = getMilvus(session, input, aiAgent,bHasCach); - }else { - session.setDbType("G"); - sResponMessage = getDynamicTableSql(session, input, userId, userInput,0,StrUtil.EMPTY,StrUtil.EMPTY,"0",StrUtil.EMPTY, aiAgent,sCleanSql); - } +// if(!isAggregation){ +// //获取常量库内容 +// session.setDbType("X"); +// sResponMessage = getMilvus(session, input, aiAgent,bHasCach); +// }else { + session.setDbType("G"); + sResponMessage = getDynamicTableSql(session, input, userId, userInput,0,StrUtil.EMPTY,StrUtil.EMPTY,"0",StrUtil.EMPTY, aiAgent,sCleanSql); +// } return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(sResponMessage).sReturnType(ReturnTypeCode.HTML.getCode()).dbType(session.getDbType()).dbCach(session.getDbCach()).build(); } else if (ObjectUtil.isNotEmpty(session.getCurrentTool())) { //2.处理工具参数采集结束后业务逻辑处理 @@ -665,6 +665,11 @@ public class XlyErpService { throw e; } + //如果查询不到数据走向量库 + if(ObjectUtil.isNotEmpty(sqlResult)){ + session.setDbType("X"); + return getMilvus(session, input, aiAgent,false); + } // 5. 调用AI服务生成自然语言解释(传入表结构,让解释更贴合业务) String resultJson = JSON.toJSONString(sqlResult);