From 111c93ba533e13d9b47660c1e68ab1f9a23cfb68 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 19 四月 2024 10:54:40 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java index 1540222..18fb07f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java @@ -184,7 +184,7 @@ // returnQues.setCode(null); List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset"); returnQues.setContent(JSON.toJSONString(backQusetRedis)); - returnQues.setJsy("鎰熻阿鎮ㄧ殑鑰愬績鍥炵瓟锛屽啀瑙�"); + returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter()); redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES); redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES); @@ -205,7 +205,7 @@ redisCache.setCacheObject(userId + "noVoice", noVoice2, 120, TimeUnit.MINUTES); } } else { - //瀵瑰洖绛旂殑闂,杩涜姝e垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛� + //瀵瑰洖绛旂殑闂,杩涜姝e垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛墄 for (int j = 0; j < ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size(); j++) { //鍖呭惈 Matcher matcher = null; @@ -232,12 +232,22 @@ redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES); //鑾峰彇涓嬩竴棰� Integer nextQuestion = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion(); - for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) { - if (script.getTargetid() == nextQuestion) { - QuestionMessage returnQues = new QuestionMessage(); - returnQues.setNowQuestion(script); - redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES); - break; + if (nextQuestion > ivrLibaTemplateScriptVOList.size()) { + //濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜� + QuestionMessage returnQues = new QuestionMessage(); + List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset"); + returnQues.setContent(JSON.toJSONString(backQusetRedis)); + returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter()); + redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES); + redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES); + } else { + for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) { + if (script.getTargetid() == nextQuestion) { + QuestionMessage returnQues = new QuestionMessage(); + returnQues.setNowQuestion(script); + redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES); + break; + } } } break; -- Gitblit v1.9.3