From f55c563e2a0b52e4569ce6b5f81632cac598f7fe Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 十月 2024 18:36:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 332 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 206 insertions(+), 126 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 37e4338..fae4378 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
@@ -8,8 +8,8 @@
import com.smartor.domain.*;
import com.smartor.mapper.IvrLibaExtemplatescriptMapper;
import com.smartor.service.IIvrLibaTemplateService;
-import com.smartor.service.IIvrTaskTemplateService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.BinaryMessage;
@@ -32,7 +32,7 @@
private static RedisCache redisCache;
- private static IIvrTaskTemplateService ivrTaskTemplateService;
+ private static IIvrLibaTemplateService ivrLibaTemplateService;
private static IvrLibaExtemplatescriptMapper ivrLibaExtemplatescriptMapper;
@@ -45,8 +45,8 @@
}
@Autowired
- public void setTodayReaderService(IIvrTaskTemplateService ivrTaskTemplateService) {
- ChatWebSocketHandler.ivrTaskTemplateService = ivrTaskTemplateService;
+ public void setTodayReaderService(IIvrLibaTemplateService ivrLibaTemplateService) {
+ ChatWebSocketHandler.ivrLibaTemplateService = ivrLibaTemplateService;
}
@Autowired
@@ -116,17 +116,17 @@
if (session != null && session.isOpen()) {
if (socketMessage.getTemplateId() != null) {
//閫氳繃妯℃澘ID鑾峰彇妯℃澘闂
- IvrTaskTemplateVO ivrTaskTemplateVO = new IvrTaskTemplateVO();
- ivrTaskTemplateVO.setId(socketMessage.getTemplateId());
- IvrTaskTemplateVO ivrTaskTemplateVO1 = ivrTaskTemplateService.selectInfoByCondition(ivrTaskTemplateVO);
- redisCache.setCacheObject(userId + "ivrTaskTemplateVO1", ivrTaskTemplateVO1, 120, TimeUnit.MINUTES);
+ IvrLibaTemplateVO ivrLibaTemplateVO = new IvrLibaTemplateVO();
+ ivrLibaTemplateVO.setId(socketMessage.getTemplateId());
+ IvrLibaTemplateVO ivrLibaTemplateVO1 = ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO);
+ redisCache.setCacheObject(userId + "ivrLibaTemplateVO1", ivrLibaTemplateVO1, 120, TimeUnit.MINUTES);
//灏嗘煡鍑烘潵鐨勯棶棰�,鏀惧埌鍏ㄥ眬鍙橀噺涓幓
- List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOList = ivrTaskTemplateVO1.getIvrTaskTemplateScriptVOList();
+ List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = ivrLibaTemplateVO1.getIvrLibaTemplateScriptVOList();
//鏍规嵁搴忓彿杩涜鎺掑簭
- Collections.sort(ivrTaskTemplateScriptVOList, Comparator.comparing(IvrTaskTemplateScriptVO::getTargetid));
+ Collections.sort(ivrLibaTemplateScriptVOList, Comparator.comparing(IvrLibaTemplateScriptVO::getSort));
//灏嗘煡鍑烘潵鐨勬暟鎹斁鍒皉edis涓�
- redisCache.setCacheObject(userId + "ivrTaskTemplateScriptVOList", ivrTaskTemplateScriptVOList, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "ivrLibaTemplateScriptVOList", ivrLibaTemplateScriptVOList, 120, TimeUnit.MINUTES);
//鐢ㄦ潵杩斿洖璋冩煡鐨勬�荤粨鏋�
redisCache.setCacheObject(userId + "backQuset", new ArrayList<>(), 120, TimeUnit.MINUTES);
//鐢ㄦ潵璁板綍鏃犲０鍝嶅簲娆℃暟
@@ -137,16 +137,17 @@
redisCache.setCacheObject(userId + "isOver", 0, 120, TimeUnit.MINUTES);
//鐢ㄦ潵杩斿洖褰撳墠闇�瑕侀棶鐨勯棶棰樹俊鎭�
- QuestionMessage returnQues = new QuestionMessage();
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
- for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOList) {
- if (ivrTaskTemplateScriptVO.getTargetid() == ivrTaskTemplateVO1.getFirstQuestionNum().intValue())
+
+ for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
+ if (ivrLibaTemplateScriptVO.getSort() == ivrLibaTemplateVO1.getFirstQuestionNum().intValue())
//鑾峰彇绗竴棰樼殑闂
- returnQues.setNowQuestion(ivrTaskTemplateScriptVO);
+ returnQues.setNowQuestion(ivrLibaTemplateScriptVO);
// returnQues.setCode(ivrTaskTemplateScriptVO.getTargetid() + 1);
}
// 璁剧疆寮�鍦虹櫧
- returnQues.setKcb(ivrTaskTemplateVO1.getRevisitBefore());
+ returnQues.setKcb(ivrLibaTemplateVO1.getRevisitBefore());
//璁板綍鍝嶅簲
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
@@ -154,44 +155,45 @@
//鑾峰彇socketMessage閲岀殑QuestionMessage,瀵圭瓟妗堣繘琛屽鐞嗙劧鍚�,鍐嶉棶涓嬩竴閬�
Gson gson = new Gson();
if (!StringUtils.isEmpty(socketMessage.getContent())) {
- socketMessage.setQuestionMessage(gson.fromJson(socketMessage.getContent(), QuestionMessage.class));
+ socketMessage.setQuestionMessage(gson.fromJson(socketMessage.getContent(), QuestionMessagePhone.class));
}
- QuestionMessage questionMessage = socketMessage.getQuestionMessage();
- List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOList = redisCache.getCacheObject(userId + "ivrTaskTemplateScriptVOList");
+ QuestionMessagePhone questionMessage = socketMessage.getQuestionMessage();
+ List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = redisCache.getCacheObject(userId + "ivrLibaTemplateScriptVOList");
//鏍规嵁鍓嶇浼犲洖鐨勬潯浠讹紝鑾峰彇褰撳墠棰樼洰
- IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = questionMessage.getNowQuestion();
- if (ivrTaskTemplateScriptVO.getId() == null) {
- QuestionMessage returnQues = redisCache.getCacheObject(userId + "returnQues");
- ivrTaskTemplateScriptVO = returnQues.getNowQuestion();
+ IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO = questionMessage.getNowQuestion();
+ if (ivrLibaTemplateScriptVO.getId() == null) {
+ QuestionMessagePhone returnQues = redisCache.getCacheObject(userId + "returnQues");
+ ivrLibaTemplateScriptVO = returnQues.getNowQuestion();
}
//鑾峰彇妯℃澘淇℃伅
- IvrTaskTemplateVO ivrTaskTemplateVO1 = redisCache.getCacheObject(userId + "ivrTaskTemplateVO1");
+ IvrLibaTemplateVO ivrLibaTemplateVO1 = redisCache.getCacheObject(userId + "ivrLibaTemplateVO1");
+
if (StringUtils.isEmpty(questionMessage.getContent())) {
//璋冪敤ivrTaskTemplateScriptVO涓殑slienceText(闈欓粯璇濇湳)
Integer noVoice = redisCache.getCacheObject(userId + "noVoice");
//瀹為檯闈欓粯娆℃暟鏄惁 绛変簬 妯℃澘涓厤缃殑娆℃暟
- if (noVoice == ivrTaskTemplateVO1.getNoVoiceNum().intValue()) {
+ if (noVoice == ivrLibaTemplateVO1.getNoVoiceNum().intValue()) {
//鐢ㄦ潵杩斿洖璋冩煡鐨勬�荤粨鏋�
- List<IvrTaskTemplateScriptVO> backQuset = new ArrayList<>();
- backQuset.add(ivrTaskTemplateScriptVO);
+ List<IvrLibaTemplateScriptVO> backQuset = new ArrayList<>();
+ backQuset.add(ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
//濡傛灉鍑犳閮芥病鍝嶅簲锛屽氨涓嬩竴棰橈紙闇�瑕佸厛鍒ゆ柇鏄惁鏈変笅涓�棰橈級
- if (ivrTaskTemplateScriptVO.getTargetid() == ivrTaskTemplateScriptVOList.size()) {
+ if (ivrLibaTemplateScriptVO.getSort() == 0) {
//濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜�
- QuestionMessage returnQues = new QuestionMessage();
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
// returnQues.setCode(null);
- List<IvrTaskTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues.setContent(JSON.toJSONString(backQusetRedis));
- returnQues.setJsy(ivrTaskTemplateVO1.getRevisitAfter());
+ returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
} else {
//濡傛灉鏈変笅涓�棰橈紝灏辨牴鎹綋鍓峵eagetID+1 鑾峰彇涓嬩竴棰�
- QuestionMessage returnQues = getNextQuestion(ivrTaskTemplateScriptVOList, ivrTaskTemplateScriptVO);
+ QuestionMessagePhone returnQues = getNextQuestion(ivrLibaTemplateScriptVOList, ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
}
@@ -203,81 +205,146 @@
Integer noVoice2 = redisCache.getCacheObject(userId + "noVoice");
noVoice2 = noVoice2 + 1;
+
+ //缁欓棶棰樺姞涓婃棤鍖归厤璇濇湳
+ QuestionMessagePhone returnQues = redisCache.getCacheObject(userId + "returnQues");
+ IvrLibaTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
+ boolean contains = nowQuestion.getScriptContent().contains(nowQuestion.getNoMatchText());
+ if (!contains) {
+ String scriptContent = nowQuestion.getSlienceText() + "," + nowQuestion.getScriptContent();
+ nowQuestion.setScriptContent(scriptContent);
+ }
+ returnQues.setNowQuestion(nowQuestion);
+ redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "noVoice", noVoice2, 120, TimeUnit.MINUTES);
}
} else {
- //閫氳繃valueType鍒ゆ柇鏄粈涔堥鍨嬶紙鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級锛�
- if (ivrTaskTemplateScriptVO.getValueType() == 2 || ivrTaskTemplateScriptVO.getValueType() == 3) {
- ivrTaskTemplateScriptVO.setQuestionResult(questionMessage.getContent());
- List<IvrTaskTemplateScriptVO> backQusetList = redisCache.getCacheObject(userId + "backQuset");
+ String extemplateID = ivrLibaTemplateVO1.getSubmoduleID();
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(extemplateID)) {
+ String[] split = extemplateID.split(",");
+ List<String> list = Arrays.asList(split);
+ List<Long> list1 = new ArrayList<>();
+ for (String str : list) {
+ list1.add(Long.valueOf(str));
+ }
+ List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
+ IvrLibaExtemplatescript les = null;
+ for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
+ Matcher matcher = null;
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
+ Pattern pattern = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex());
+ matcher = pattern.matcher(questionMessage.getContent());
+ }
+
+ Matcher matcher2 = null;
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2())) {
+ Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
+ matcher2 = pattern2.matcher(questionMessage.getContent());
+ }
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || org.apache.commons.lang3.StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || org.apache.commons.lang3.StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && org.apache.commons.lang3.StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
+ //灏嗛�氱敤搴撳尮閰嶇殑锛屾斁鍒拌繑鍥炲�间腑
+ ivrLibaTemplateScriptVO.setCommonValue(ivrLibaExtemplatescript.getSwitchText());
+ les = ivrLibaExtemplatescript;
+ }
+ break;
+ }
+ if (ObjectUtils.isNotEmpty(les)) {
+ //瀵瑰尮閰嶇殑缁撴灉澶勭悊涓�涓�(鐪嬬湅鏄笉鏄渶瑕佹寕鏈�)
+ if (les.getIsEnd() != null && les.getIsEnd() == 1) {
+ //鍙互鎸傛満浜�
+ redisCache.deleteObject(userId + "ivrLibaTemplateScriptVOList");
+ redisCache.deleteObject(userId + "backQuset");
+ redisCache.deleteObject(userId + "noVoice");
+ redisCache.deleteObject(userId + "returnQues");
+ redisCache.deleteObject(userId + "isOver");
+ redisCache.deleteObject(userId + "ivrLibaTemplateVO1");
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
+ List<IvrLibaTemplateScriptVO> backQuset = new ArrayList<>();
+ IvrLibaTemplateScriptVO ls = new IvrLibaTemplateScriptVO();
+ ls.setScriptContent(les.getSwitchText());
+ backQuset.add(ls);
+ returnQues.setQuestionList(backQuset);
+ returnQues.setNowQuestion(ls);
+ session.sendMessage(new TextMessage(JSON.toJSONString(returnQues).getBytes(StandardCharsets.UTF_8)));
+ return;
+ }
+ }
+ }
+
+
+ //閫氳繃valueType鍒ゆ柇鏄粈涔堥鍨嬶紙鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級锛�
+ if (ivrLibaTemplateScriptVO.getValueType() == 2 || ivrLibaTemplateScriptVO.getValueType() == 3) {
+ ivrLibaTemplateScriptVO.setQuestionResult(questionMessage.getContent());
+
+ List<IvrLibaTemplateScriptVO> backQusetList = redisCache.getCacheObject(userId + "backQuset");
//鍖归厤瀹屾垚鍚�,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
- backQusetList.add(ivrTaskTemplateScriptVO);
+ backQusetList.add(ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "backQuset", backQusetList, 120, TimeUnit.MINUTES);
//灏嗛潤榛樼疆涓�0
redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
//鑾峰彇涓嬩竴棰�
- Long nextQuestion = ivrTaskTemplateScriptVO.getTargetid() + 1;
- if (nextQuestion > ivrTaskTemplateScriptVOList.size()) {
+ Long nextQuestion = Long.valueOf(ivrLibaTemplateScriptVO.getSort() + 1);
+ if (nextQuestion > ivrLibaTemplateScriptVOList.size()) {
//濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜�
- QuestionMessage returnQues = new QuestionMessage();
- List<IvrTaskTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues.setContent(JSON.toJSONString(backQusetRedis));
- returnQues.setJsy(ivrTaskTemplateVO1.getRevisitAfter());
+ returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
} else {
- for (IvrTaskTemplateScriptVO script : ivrTaskTemplateScriptVOList) {
- if (script.getTargetid() == nextQuestion) {
- QuestionMessage returnQues = new QuestionMessage();
+ for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) {
+ if (Long.valueOf(script.getSort()) == nextQuestion) {
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
returnQues.setNowQuestion(script);
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
}
}
}
- } else if (ivrTaskTemplateScriptVO.getValueType() == 1) {
+ } else if (ivrLibaTemplateScriptVO.getValueType() == 1) {
//瀵瑰洖绛旂殑闂,杩涜姝ｅ垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛墄
- for (int j = 0; j < ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size(); j++) {
+ for (int j = 0; j < ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size(); j++) {
//鍖呭惈
Matcher matcher = null;
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex())) {
- Pattern pattern = Pattern.compile(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex());
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex())) {
+ Pattern pattern = Pattern.compile(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex());
matcher = pattern.matcher(questionMessage.getContent());
}
//涓嶅寘鍚�
Matcher matcher2 = null;
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2())) {
- Pattern pattern2 = Pattern.compile(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2());
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2())) {
+ Pattern pattern2 = Pattern.compile(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
matcher2 = pattern2.matcher(questionMessage.getContent());
}
- log.info("==============================Targetregex鐨勫�间负锛歿}, Targetregex2鐨勫�间负锛歿}", ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex(), ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2());
+ log.info("==============================Targetregex鐨勫�间负锛歿}, Targetregex2鐨勫�间负锛歿}", ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex(), ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() || StringUtils.isEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
-
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() || StringUtils.isEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
+ log.error("鍖归厤姝ｇ‘浜�");
//璇存槑鍖归厤姝ｇ‘浜�
- ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).setIsUserOperation(1);
- List<IvrTaskTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
+ ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).setIsUserOperation(1);
+ List<IvrLibaTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
//鍖归厤瀹屾垚鍚�,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
- backQuset.add(ivrTaskTemplateScriptVO);
+ backQuset.add(ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
//灏嗛潤榛樼疆涓�0
redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
//鑾峰彇涓嬩竴棰�
- Long nextQuestion = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getNextQuestion();
- if (nextQuestion > ivrTaskTemplateScriptVOList.size()) {
+ Integer nextQuestion = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
+ if (nextQuestion > ivrLibaTemplateScriptVOList.size()) {
//濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜�
- QuestionMessage returnQues = new QuestionMessage();
- List<IvrTaskTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues.setContent(JSON.toJSONString(backQusetRedis));
- returnQues.setJsy(ivrTaskTemplateVO1.getRevisitAfter());
+ returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
} else {
- for (IvrTaskTemplateScriptVO script : ivrTaskTemplateScriptVOList) {
- if (script.getTargetid() == nextQuestion) {
- QuestionMessage returnQues = new QuestionMessage();
+ for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) {
+ if (script.getSort() == nextQuestion) {
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
returnQues.setNowQuestion(script);
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
break;
@@ -286,100 +353,113 @@
}
break;
} else {
+ log.error("鏃犲尮閰�");
//娌℃湁鍖归厤鍒�
Integer mateNum = redisCache.getCacheObject(userId + "mateNum");
//鏃犲尮閰嶆鏁板幓鍒ゆ柇鏄惁鍒版渶澶ц闂鏁帮紝骞朵笖鎵�鏈夌殑閫夐」閮藉尮閰嶅畬浜�
- if (mateNum == ivrTaskTemplateVO1.getMateNum().intValue() && j == ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size() - 1) {
+ if (mateNum == ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
//闂簡鏈�澶ц闂鏁板悗锛岃繕鏄病鏈夊尮閰嶄笂,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
- List<IvrTaskTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
- backQuset.add(ivrTaskTemplateScriptVO);
+ List<IvrLibaTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
+ backQuset.add(ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
//濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣
- if (ivrTaskTemplateScriptVO.getTargetid() < ivrTaskTemplateScriptVOList.size()) {
- QuestionMessage returnQues = getNextQuestion(ivrTaskTemplateScriptVOList, ivrTaskTemplateScriptVO);
+ if (ivrLibaTemplateScriptVO.getSort() == 0) {
+ QuestionMessagePhone returnQues = getNextQuestion(ivrLibaTemplateScriptVOList, ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "mateNum", 0, 120, TimeUnit.MINUTES);
} else {
- QuestionMessage returnQues2 = new QuestionMessage();
+ QuestionMessagePhone returnQues2 = new QuestionMessagePhone();
// returnQues2.setCode(null);
- List<IvrTaskTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues2.setQuestionList(backQusetRedis);
- returnQues2.setJsy("鎰熻阿鎮ㄧ殑鑰愬績鍥炵瓟锛屽啀瑙�");
+ returnQues2.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
redisCache.setCacheObject(userId + "returnQues", returnQues2, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
break;
}
- } else if (mateNum < ivrTaskTemplateVO1.getMateNum().intValue() && j == ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size() - 1) {
+ } else if (mateNum < ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
//娌℃湁闂埌瑙勫畾娆℃暟
mateNum = mateNum + 1;
redisCache.setCacheObject(userId + "mateNum", mateNum, 120, TimeUnit.MINUTES);
- }
- }
- }
- }
- //閫夐」鍖归厤瀹屾垚鍚庯紝闇�瑕佸啀鍘婚�氳繃搴撳啀杩涜鍖归厤涓�娆�
- String extemplateID = ivrTaskTemplateVO1.getSubmoduleID();
- String[] split = extemplateID.split(",");
- List<String> list = Arrays.asList(split);
- List<Long> list1 = new ArrayList<>();
- if (StringUtils.isNotEmpty(extemplateID)) {
- for (String str : list) {
- list1.add(Long.valueOf(str));
- }
- List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
- for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
- Matcher matcher = null;
- if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
- Pattern pattern = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex());
- matcher = pattern.matcher(questionMessage.getContent());
- }
-
- Matcher matcher2 = null;
- if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2())) {
- Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
- matcher2 = pattern2.matcher(questionMessage.getContent());
- }
- log.info("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
-
- if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
- QuestionMessage returnQues = redisCache.getCacheObject(userId + "returnQues");
- IvrTaskTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
- nowQuestion.setSubmoduleText(ivrLibaExtemplatescript.getSwitchText());
- nowQuestion.setSubmoduleVoice(ivrLibaExtemplatescript.getSwitchWav());
- redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
- if (ivrLibaExtemplatescript.getIsEnd() == 1) {
- //灏嗛棶棰樼疆绌�
- IvrTaskTemplateScriptVO nowQuestion1 = returnQues.getNowQuestion();
- nowQuestion1.setScriptContent(null);
- nowQuestion1.setScriptVoice(null);
- returnQues.setNowQuestion(nowQuestion1);
+ //缁欓棶棰樺姞涓婃棤鍖归厤璇濇湳
+ QuestionMessagePhone returnQues = redisCache.getCacheObject(userId + "returnQues");
+ IvrLibaTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
+ boolean contains = false;
+ if (StringUtils.isNotEmpty(nowQuestion.getNoMatchText()))
+ contains = nowQuestion.getScriptContent().contains(nowQuestion.getNoMatchText());
+ if (!contains) {
+ String scriptContent = nowQuestion.getNoMatchText() + "," + nowQuestion.getScriptContent();
+ nowQuestion.setScriptContent(scriptContent);
+ }
+ returnQues.setNowQuestion(nowQuestion);
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
-
- redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
}
}
- break;
}
}
+// //閫夐」鍖归厤瀹屾垚鍚庯紝闇�瑕佸啀鍘婚�氳繃搴撳啀杩涜鍖归厤涓�娆�
+// String extemplateID = ivrLibaTemplateVO1.getSubmoduleID();
+// String[] split = extemplateID.split(",");
+// List<String> list = Arrays.asList(split);
+// List<Long> list1 = new ArrayList<>();
+// if (StringUtils.isNotEmpty(extemplateID)) {
+// for (String str : list) {
+// list1.add(Long.valueOf(str));
+// }
+// List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
+// for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
+// Matcher matcher = null;
+// if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
+// Pattern pattern = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex());
+// matcher = pattern.matcher(questionMessage.getContent());
+// }
+//
+// Matcher matcher2 = null;
+// if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2())) {
+// Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
+// matcher2 = pattern2.matcher(questionMessage.getContent());
+// }
+// log.info("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
+//
+// if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
+// QuestionMessagePhone returnQues = redisCache.getCacheObject(userId + "returnQues");
+// IvrLibaTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
+// nowQuestion.setSubmoduleText(ivrLibaExtemplatescript.getSwitchText());
+// nowQuestion.setSubmoduleVoice(ivrLibaExtemplatescript.getSwitchWav());
+// redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
+// if (ivrLibaExtemplatescript.getIsEnd() == 1) {
+// //灏嗛棶棰樼疆绌�
+// IvrLibaTemplateScriptVO nowQuestion1 = returnQues.getNowQuestion();
+// nowQuestion1.setScriptContent(null);
+// nowQuestion1.setScriptVoice(null);
+// returnQues.setNowQuestion(nowQuestion1);
+// redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
+//
+// redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
+// }
+// }
+// break;
+// }
+// }
}
}
- QuestionMessage returnQues = redisCache.getCacheObject(userId + "returnQues");
- List<IvrTaskTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ QuestionMessagePhone returnQues = redisCache.getCacheObject(userId + "returnQues");
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues.setQuestionList(backQusetRedis);
session.sendMessage(new TextMessage(JSON.toJSONString(returnQues).getBytes(StandardCharsets.UTF_8)));
//鏁翠釜娴佺▼鏄惁缁撴潫锛屽皢redis涓殑璇serId涓嬬殑鏁版嵁鍒犻櫎;
Integer isOver = redisCache.getCacheObject(userId + "isOver");
if (isOver == 1) {
- redisCache.deleteObject(userId + "ivrTaskTemplateScriptVOList");
+ redisCache.deleteObject(userId + "ivrLibaTemplateScriptVOList");
redisCache.deleteObject(userId + "backQuset");
redisCache.deleteObject(userId + "noVoice");
redisCache.deleteObject(userId + "returnQues");
redisCache.deleteObject(userId + "isOver");
- redisCache.deleteObject(userId + "ivrTaskTemplateVO1");
+ redisCache.deleteObject(userId + "ivrLibaTemplateVO1");
try {
//鏂紑閾炬帴
afterConnectionClosed(session, null);
@@ -391,12 +471,12 @@
}
//鑾峰彇涓嬩竴棰橈紙杩欎釜鏂规硶涓嶉�傚悎閫夐」涓殑nextQuestion锛�
- private QuestionMessage getNextQuestion(List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOList, IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO) {
- QuestionMessage returnQues = new QuestionMessage();
- for (int j = 0; j < ivrTaskTemplateScriptVOList.size(); j++) {
- if (ivrTaskTemplateScriptVOList.get(j).getTargetid() == ivrTaskTemplateScriptVO.getTargetid() + 1) {
+ private QuestionMessagePhone getNextQuestion(List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList, IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO) {
+ QuestionMessagePhone returnQues = new QuestionMessagePhone();
+ for (int j = 0; j < ivrLibaTemplateScriptVOList.size(); j++) {
+ if (ivrLibaTemplateScriptVOList.get(j).getSort() == ivrLibaTemplateScriptVO.getSort() + 1) {
// 瀵硅鏉emplateScriptVO杩涜澶勭悊
- returnQues.setNowQuestion(ivrTaskTemplateScriptVOList.get(j));
+ returnQues.setNowQuestion(ivrLibaTemplateScriptVOList.get(j));
}
}
return returnQues;
--
Gitblit v1.9.3