添加向量库

qianbao
1 parent ec753538
Showing 3 changed files with 14 additions and 17 deletions
src/main/java/com/xly/service/XlyErpService.java
src/main/java/com/xly/tts/bean/TTSRequestDTO.java
src/main/java/com/xly/tts/service/PythonTtsProxyService.java
@@ -1012,14 +1012,13 @@ public class XlyErpService {
     private String getSelectAgent(UserSceneSession session,Integer page){
         List<ToolMeta> 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<Map<String,Object>> data = getAiUserAgentQuestion(session.getUserId(),sSceneId, sToolId, page,3);
+        List<Map<String,Object>> 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<ToolMeta> showListAll = new ArrayList<>();
@@ -1038,7 +1037,7 @@ public class XlyErpService {
                     .append(" </div>");
         });
         sb.append("</div>");
-        sb.append(" <div style=\"color: #4096ff;  margin-top: 5px;width:100%;text-align:right;margin-right:10px;font-size:12px;\" data-action=\"resetTag\" data-text=\"").append(sSceneId).append(",").append(sToolId).append(",").append(page+1).append(",").append(iPageCount).append("\" onclick=\"reset(换一换)\">");
+        sb.append(" <div style=\"color: #4096ff;  margin-top: 5px;width:100%;text-align:right;margin-right:10px;font-size:12px;\" data-action=\"resetTag\" data-text=\"").append(sSceneId).append(",").append(page+1).append(",").append(iPageCount).append("\" onclick=\"reset(换一换)\">");
         sb.append(" 换一换").append("</div>");
         return sb.toString();
     }
@@ -1050,36 +1049,32 @@ public class XlyErpService {
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      * @Description 换一换获取最近数据
      **/
-    private List<Map<String,Object>> getAiUserAgentQuestion(String sLoginId, String sSceneId, String sMethodId, Integer iPageNum,Integer iPageSize){
+    private List<Map<String,Object>> 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<String,Object> 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<String,Object> serMap = new HashMap<>();
-        serMap.put("sLoginId",sLoginId);
+        serMap.put("sUserName",sUserName);
         serMap.put("sSceneId",sSceneId);
-        serMap.put("sMethodId",sMethodId);
         List<Map<String,Object>>  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;
     }
@@ -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
@@ -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);
     }