Administrator / xlyAi

Commit ffda995355d61c5687b0d66af3ffc51ac1c25279

Authored by qianbao
1 parent ec753538

添加向量库

Inline Side-by-side
Showing 3 changed files with 14 additions and 17 deletions
src/main/java/com/xly/service/XlyErpService.java
  View file @ffda995
... ... @@ -1012,14 +1012,13 @@ public class XlyErpService {
1012 1012 private String getSelectAgent(UserSceneSession session,Integer page){
1013 1013 List<ToolMeta> toolMetaAll = session.getAuthTool();
1014 1014 String sSceneId = session.getCurrentScene().getSId();
1015   - String sToolId = session.getCurrentTool().getSId();
1016 1015 toolMetaAll = toolMetaAll.stream().filter(to-> to.getSSceneId().equals(session.getCurrentScene().getSId())).collect(Collectors.toUnmodifiableList());
1017 1016 StringBuffer sb = new StringBuffer();
1018 1017 //获取用户最近五次问题
1019   - List<Map<String,Object>> data = getAiUserAgentQuestion(session.getUserId(),sSceneId, sToolId, page,3);
  1018 + List<Map<String,Object>> data = getAiUserAgentQuestion(session.getUserName(),sSceneId, page,3);
1020 1019 Integer iPageCount = 0;
1021 1020 if(page==1){
1022   - iPageCount =getAiUserAgentQuestionCount(session.getUserId(), sSceneId, sToolId);
  1021 + iPageCount =getAiUserAgentQuestionCount(session.getUserName(),sSceneId);
1023 1022 iPageCount = (int) Math.ceil(iPageCount/3);
1024 1023 }
1025 1024 List<ToolMeta> showListAll = new ArrayList<>();
... ... @@ -1038,7 +1037,7 @@ public class XlyErpService {
1038 1037 .append(" </div>");
1039 1038 });
1040 1039 sb.append("</div>");
1041   - 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(换一换)\">");
  1040 + 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(换一换)\">");
1042 1041 sb.append(" 换一换").append("</div>");
1043 1042 return sb.toString();
1044 1043 }
... ... @@ -1050,36 +1049,32 @@ public class XlyErpService {
1050 1049 * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
1051 1050 * @Description 换一换获取最近数据
1052 1051 **/
1053   - private List<Map<String,Object>> getAiUserAgentQuestion(String sLoginId, String sSceneId, String sMethodId, Integer iPageNum,Integer iPageSize){
  1052 + private List<Map<String,Object>> getAiUserAgentQuestion(String sUserName, String sSceneId, Integer iPageNum,Integer iPageSize){
1054 1053 StringBuffer sb = new StringBuffer().append("SELECT sId,iUpdate,sUserInput FROM ai_user_agent_question ")
1055   - .append("WHERE sLoginId = #{sLoginId} ")
  1054 + .append("WHERE sLoginId = #{sUserName} ")
1056 1055 .append("AND sSceneId = #{sSceneId} ")
1057   - .append("AND sMethodId = #{sMethodId} ")
1058 1056 .append("AND IFNULL(sUserInput,'') <> '' ")
1059 1057 .append("ORDER BY iUpdate DESC,tUpdateDate DESC ")
1060 1058 .append("LIMIT #{iPageNum},#{iPageSize} ");
1061 1059 Map<String,Object> serMap = new HashMap<>();
1062   - serMap.put("sLoginId",sLoginId);
  1060 + serMap.put("sUserName",sUserName);
1063 1061 serMap.put("sSceneId",sSceneId);
1064   - serMap.put("sMethodId",sMethodId);
1065   - serMap.put("iPageNum",iPageNum);
  1062 + serMap.put("iPageNum",(iPageNum-1)*iPageSize);
1066 1063 serMap.put("iPageSize",iPageSize);
1067 1064 return dynamicExeDbService.findSql(serMap,sb.toString());
1068 1065 }
1069 1066  
1070   - private Integer getAiUserAgentQuestionCount(String sLoginId, String sSceneId, String sMethodId){
  1067 + private Integer getAiUserAgentQuestionCount(String sUserName, String sSceneId){
1071 1068 StringBuffer sb = new StringBuffer().append("SELECT COUNT(1) AS iCount FROM ai_user_agent_question ")
1072   - .append("WHERE sLoginId = #{sLoginId} ")
  1069 + .append("WHERE sLoginId = #{sUserName} ")
1073 1070 .append("AND sSceneId = #{sSceneId} ")
1074   - .append("AND sMethodId = #{sMethodId} ")
1075 1071 .append("AND IFNULL(sUserInput,'') <> '' ");
1076 1072 Map<String,Object> serMap = new HashMap<>();
1077   - serMap.put("sLoginId",sLoginId);
  1073 + serMap.put("sUserName",sUserName);
1078 1074 serMap.put("sSceneId",sSceneId);
1079   - serMap.put("sMethodId",sMethodId);
1080 1075 List<Map<String,Object>> data = dynamicExeDbService.findSql(serMap,sb.toString());
1081 1076 if(ObjectUtil.isNotEmpty(data)){
1082   - return (Integer) data.get(0).get("iCount");
  1077 + return Integer.valueOf( data.get(0).get("iCount").toString());
1083 1078 }
1084 1079 return 0;
1085 1080 }
... ...
src/main/java/com/xly/tts/bean/TTSRequestDTO.java
  View file @ffda995
... ... @@ -15,6 +15,8 @@ public class TTSRequestDTO {
15 15 private String rate = "+10%";
16 16 private String volume = "+0%";
17 17 private Boolean voiceless;
  18 + private Integer iPage;
  19 + private String sSceneId;
18 20  
19 21  
20 22 }
21 23 \ No newline at end of file
... ...
src/main/java/com/xly/tts/service/PythonTtsProxyService.java
  View file @ffda995
... ... @@ -82,7 +82,7 @@ public class PythonTtsProxyService {
82 82 String sSubsidiaryId = request.getSubsidiaryid();
83 83 String sUserType = request.getUsertype();
84 84 String authorization = request.getAuthorization();
85   - Integer iPage = Integer.valueOf(userInput);
  85 + Integer iPage = request.getIPage();
86 86 AiResponseDTO voiceText = xlyErpService.change(sUserId, sUserName , sBrandsId , sSubsidiaryId, sUserType, authorization,iPage);
87 87 return synthesizeStreamAi(request, voiceText);
88 88 }
... ...