From ffda995355d61c5687b0d66af3ffc51ac1c25279 Mon Sep 17 00:00:00 2001 From: qianbao Date: Tue, 7 Apr 2026 11:52:51 +0800 Subject: [PATCH] 添加向量库 --- src/main/java/com/xly/service/XlyErpService.java | 27 +++++++++++---------------- src/main/java/com/xly/tts/bean/TTSRequestDTO.java | 2 ++ src/main/java/com/xly/tts/service/PythonTtsProxyService.java | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java index f520db2..d64841d 100644 --- a/src/main/java/com/xly/service/XlyErpService.java +++ b/src/main/java/com/xly/service/XlyErpService.java @@ -1012,14 +1012,13 @@ public class XlyErpService { private String getSelectAgent(UserSceneSession session,Integer page){ List toolMetaAll = session.getAuthTool(); String sSceneId = session.getCurrentScene().getSId(); - String sToolId = session.getCurrentTool().getSId(); toolMetaAll = toolMetaAll.stream().filter(to-> to.getSSceneId().equals(session.getCurrentScene().getSId())).collect(Collectors.toUnmodifiableList()); StringBuffer sb = new StringBuffer(); //获取用户最近五次问题 - List> data = getAiUserAgentQuestion(session.getUserId(),sSceneId, sToolId, page,3); + List> data = getAiUserAgentQuestion(session.getUserName(),sSceneId, page,3); Integer iPageCount = 0; if(page==1){ - iPageCount =getAiUserAgentQuestionCount(session.getUserId(), sSceneId, sToolId); + iPageCount =getAiUserAgentQuestionCount(session.getUserName(),sSceneId); iPageCount = (int) Math.ceil(iPageCount/3); } List showListAll = new ArrayList<>(); @@ -1038,7 +1037,7 @@ public class XlyErpService { .append(" "); }); sb.append(""); - sb.append("
"); + sb.append("
"); sb.append(" 换一换").append("
"); return sb.toString(); } @@ -1050,36 +1049,32 @@ public class XlyErpService { * @return java.util.List> * @Description 换一换获取最近数据 **/ - private List> getAiUserAgentQuestion(String sLoginId, String sSceneId, String sMethodId, Integer iPageNum,Integer iPageSize){ + private List> getAiUserAgentQuestion(String sUserName, String sSceneId, Integer iPageNum,Integer iPageSize){ StringBuffer sb = new StringBuffer().append("SELECT sId,iUpdate,sUserInput FROM ai_user_agent_question ") - .append("WHERE sLoginId = #{sLoginId} ") + .append("WHERE sLoginId = #{sUserName} ") .append("AND sSceneId = #{sSceneId} ") - .append("AND sMethodId = #{sMethodId} ") .append("AND IFNULL(sUserInput,'') <> '' ") .append("ORDER BY iUpdate DESC,tUpdateDate DESC ") .append("LIMIT #{iPageNum},#{iPageSize} "); Map serMap = new HashMap<>(); - serMap.put("sLoginId",sLoginId); + serMap.put("sUserName",sUserName); serMap.put("sSceneId",sSceneId); - serMap.put("sMethodId",sMethodId); - serMap.put("iPageNum",iPageNum); + serMap.put("iPageNum",(iPageNum-1)*iPageSize); serMap.put("iPageSize",iPageSize); return dynamicExeDbService.findSql(serMap,sb.toString()); } - private Integer getAiUserAgentQuestionCount(String sLoginId, String sSceneId, String sMethodId){ + private Integer getAiUserAgentQuestionCount(String sUserName, String sSceneId){ StringBuffer sb = new StringBuffer().append("SELECT COUNT(1) AS iCount FROM ai_user_agent_question ") - .append("WHERE sLoginId = #{sLoginId} ") + .append("WHERE sLoginId = #{sUserName} ") .append("AND sSceneId = #{sSceneId} ") - .append("AND sMethodId = #{sMethodId} ") .append("AND IFNULL(sUserInput,'') <> '' "); Map serMap = new HashMap<>(); - serMap.put("sLoginId",sLoginId); + serMap.put("sUserName",sUserName); serMap.put("sSceneId",sSceneId); - serMap.put("sMethodId",sMethodId); List> data = dynamicExeDbService.findSql(serMap,sb.toString()); if(ObjectUtil.isNotEmpty(data)){ - return (Integer) data.get(0).get("iCount"); + return Integer.valueOf( data.get(0).get("iCount").toString()); } return 0; } diff --git a/src/main/java/com/xly/tts/bean/TTSRequestDTO.java b/src/main/java/com/xly/tts/bean/TTSRequestDTO.java index 6c427ce..689bca5 100644 --- a/src/main/java/com/xly/tts/bean/TTSRequestDTO.java +++ b/src/main/java/com/xly/tts/bean/TTSRequestDTO.java @@ -15,6 +15,8 @@ public class TTSRequestDTO { private String rate = "+10%"; private String volume = "+0%"; private Boolean voiceless; + private Integer iPage; + private String sSceneId; } \ No newline at end of file diff --git a/src/main/java/com/xly/tts/service/PythonTtsProxyService.java b/src/main/java/com/xly/tts/service/PythonTtsProxyService.java index 56f8b0e..156ec0d 100644 --- a/src/main/java/com/xly/tts/service/PythonTtsProxyService.java +++ b/src/main/java/com/xly/tts/service/PythonTtsProxyService.java @@ -82,7 +82,7 @@ public class PythonTtsProxyService { String sSubsidiaryId = request.getSubsidiaryid(); String sUserType = request.getUsertype(); String authorization = request.getAuthorization(); - Integer iPage = Integer.valueOf(userInput); + Integer iPage = request.getIPage(); AiResponseDTO voiceText = xlyErpService.change(sUserId, sUserName , sBrandsId , sSubsidiaryId, sUserType, authorization,iPage); return synthesizeStreamAi(request, voiceText); } -- libgit2 0.22.2