From b220383758021bcb26d0a788ebe9a31795d23b6d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 四月 2024 09:41:57 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java | 9 +
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 18 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 166 ++++++++++++++++++++-------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java | 22 ++++
smartor/src/main/java/com/smartor/domain/IvrTask.java | 2
smartor/src/main/java/com/smartor/config/PhoneUtils.java | 1
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java | 9 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java | 6
smartor/src/main/java/com/smartor/domain/IvrTaskSingleVO.java | 14 ++
smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml | 10 +-
10 files changed, 174 insertions(+), 83 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 058f5f7..d314e86 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
@@ -205,82 +205,115 @@
redisCache.setCacheObject(userId + "noVoice", noVoice2, 120, TimeUnit.MINUTES);
}
} else {
- //瀵瑰洖绛旂殑闂,杩涜姝ｅ垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛墄
- for (int j = 0; j < ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size(); j++) {
- //鍖呭惈
- Matcher matcher = null;
- 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(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2())) {
- Pattern pattern2 = Pattern.compile(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
- matcher2 = pattern2.matcher(questionMessage.getContent());
- }
- log.info("==============================Targetregex鐨勫�间负锛歿}, Targetregex2鐨勫�间负锛歿}", ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex(), ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
+ //閫氳繃valueType鍒ゆ柇鏄粈涔堥鍨嬶紙鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級锛�
+ if (ivrLibaTemplateScriptVO.getValueType() == 2 || ivrLibaTemplateScriptVO.getValueType() == 3) {
+ ivrLibaTemplateScriptVO.setQuestionResult(questionMessage.getContent());
- if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
- //璇存槑鍖归厤姝ｇ‘浜�
- ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).setIsUserOperation(true);
- List<IvrLibaTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
- //鍖归厤瀹屾垚鍚�,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
- backQuset.add(ivrLibaTemplateScriptVO);
- redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
- //灏嗛潤榛樼疆涓�0
- redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
- //鑾峰彇涓嬩竴棰�
- Integer nextQuestion = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
- 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;
- }
+ List<IvrLibaTemplateScriptVO> backQusetList = redisCache.getCacheObject(userId + "backQuset");
+ //鍖归厤瀹屾垚鍚�,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
+ backQusetList.add(ivrLibaTemplateScriptVO);
+ redisCache.setCacheObject(userId + "backQuset", backQusetList, 120, TimeUnit.MINUTES);
+ //灏嗛潤榛樼疆涓�0
+ redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
+ //鑾峰彇涓嬩竴棰�
+ Integer nextQuestion = ivrLibaTemplateScriptVO.getTargetid() + 1;
+ 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;
- } else {
- //娌℃湁鍖归厤鍒�
- Integer mateNum = redisCache.getCacheObject(userId + "mateNum");
+ }
- //鏃犲尮閰嶆鏁板幓鍒ゆ柇鏄惁鍒版渶澶ц闂鏁帮紝骞朵笖鎵�鏈夌殑閫夐」閮藉尮閰嶅畬浜�
- if (mateNum == ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
- //闂簡鏈�澶ц闂鏁板悗锛岃繕鏄病鏈夊尮閰嶄笂,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
+ } else if (ivrLibaTemplateScriptVO.getValueType() == 1) {
+
+ //瀵瑰洖绛旂殑闂,杩涜姝ｅ垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛墄
+ for (int j = 0; j < ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size(); j++) {
+ //鍖呭惈
+ Matcher matcher = null;
+ 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(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2())) {
+ Pattern pattern2 = Pattern.compile(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
+ matcher2 = pattern2.matcher(questionMessage.getContent());
+ }
+ log.info("==============================Targetregex鐨勫�间负锛歿}, Targetregex2鐨勫�间负锛歿}", ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex(), ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
+
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
+ //璇存槑鍖归厤姝ｇ‘浜�
+ ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).setIsUserOperation(true);
List<IvrLibaTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
+ //鍖归厤瀹屾垚鍚�,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
backQuset.add(ivrLibaTemplateScriptVO);
redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
-
- //濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣
- if (ivrLibaTemplateScriptVO.getTargetid() < ivrLibaTemplateScriptVOList.size()) {
- QuestionMessage 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();
-// returnQues2.setCode(null);
+ //灏嗛潤榛樼疆涓�0
+ redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
+ //鑾峰彇涓嬩竴棰�
+ Integer nextQuestion = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
+ if (nextQuestion > ivrLibaTemplateScriptVOList.size()) {
+ //濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜�
+ QuestionMessage returnQues = new QuestionMessage();
List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
- returnQues2.setQuestionList(backQusetRedis);
- returnQues2.setJsy("鎰熻阿鎮ㄧ殑鑰愬績鍥炵瓟锛屽啀瑙�");
- redisCache.setCacheObject(userId + "returnQues", returnQues2, 120, TimeUnit.MINUTES);
+ 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);
- break;
+ } 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;
+ }
+ }
}
- } else if (mateNum < ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
- //娌℃湁闂埌瑙勫畾娆℃暟
- mateNum = mateNum + 1;
- redisCache.setCacheObject(userId + "mateNum", mateNum, 120, TimeUnit.MINUTES);
+ break;
+ } else {
+ //娌℃湁鍖归厤鍒�
+ Integer mateNum = redisCache.getCacheObject(userId + "mateNum");
+
+ //鏃犲尮閰嶆鏁板幓鍒ゆ柇鏄惁鍒版渶澶ц闂鏁帮紝骞朵笖鎵�鏈夌殑閫夐」閮藉尮閰嶅畬浜�
+ if (mateNum == ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
+ //闂簡鏈�澶ц闂鏁板悗锛岃繕鏄病鏈夊尮閰嶄笂,灏嗙粨鏋滀繚瀛樺埌鏂扮殑鏁扮粍
+ List<IvrLibaTemplateScriptVO> backQuset = redisCache.getCacheObject(userId + "backQuset");
+ backQuset.add(ivrLibaTemplateScriptVO);
+ redisCache.setCacheObject(userId + "backQuset", backQuset, 120, TimeUnit.MINUTES);
+
+ //濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣
+ if (ivrLibaTemplateScriptVO.getTargetid() < ivrLibaTemplateScriptVOList.size()) {
+ QuestionMessage 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();
+// returnQues2.setCode(null);
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ returnQues2.setQuestionList(backQusetRedis);
+ returnQues2.setJsy("鎰熻阿鎮ㄧ殑鑰愬績鍥炵瓟锛屽啀瑙�");
+ redisCache.setCacheObject(userId + "returnQues", returnQues2, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
+ break;
+ }
+ } else if (mateNum < ivrLibaTemplateVO1.getMateNum().intValue() && j == ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size() - 1) {
+ //娌℃湁闂埌瑙勫畾娆℃暟
+ mateNum = mateNum + 1;
+ redisCache.setCacheObject(userId + "mateNum", mateNum, 120, TimeUnit.MINUTES);
+ }
}
}
}
@@ -329,6 +362,7 @@
}
}
}
+
}
QuestionMessage returnQues = redisCache.getCacheObject(userId + "returnQues");
List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
index 82885bf..d38093c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -50,6 +52,14 @@
PageUtils.startPageByPost(ivrTask.getPageNum(), ivrTask.getPageSize());
List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
List<IvrTaskVO> ivrTaskVOS = DtoConversionUtils.sourceToTarget(list, IvrTaskVO.class);
+
+ //璁剧疆鍒嗛〉
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(null);
+ rspData.setTotal(0);
+
if (CollectionUtils.isNotEmpty(ivrTaskVOS)) {
for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
@@ -64,8 +74,18 @@
ivrTaskVO.setWfs(wfs);
}
}
+
+ //鐢ㄤ簬鍒嗛〉
+ ivrTask.setPageNum(null);
+ ivrTask.setPageSize(null);
+ List<IvrTask> ivrTasks = ivrTaskService.selectIvrTaskList(ivrTask);
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(ivrTaskVOS);
+ rspData.setTotal(new PageInfo(ivrTasks).getTotal());
}
- return getDataTable(ivrTaskVOS);
+
+ return rspData;
}
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
index 3f990a0..c3c5cdb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
@@ -18,6 +18,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -164,7 +166,7 @@
if (inputStream == null) {
throw new HttpRequestException(RESPONSE_NULL_ERROR_CODE, "鍝嶅簲涓簄ull");
}
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("GB2312")));
StringBuffer stringBuffer = new StringBuffer();
String str = "";
while ((str = reader.readLine()) != null) {
@@ -186,7 +188,7 @@
RESPBODY respBody = JSON.parseObject(respStr, respBodyClass);
rep = new HttpEntity<RESPBODY>(respHeaders, respBody);
} else {
- rep = new HttpEntity<RESPBODY>(respHeaders, (RESPBODY) respStr);
+ rep = new HttpEntity<RESPBODY>(respHeaders, (RESPBODY) new String(respStr.getBytes("ISO8859-1"), StandardCharsets.UTF_8));
}
}
return rep;
diff --git a/smartor/src/main/java/com/smartor/config/PhoneUtils.java b/smartor/src/main/java/com/smartor/config/PhoneUtils.java
index 526587a..669ce91 100644
--- a/smartor/src/main/java/com/smartor/config/PhoneUtils.java
+++ b/smartor/src/main/java/com/smartor/config/PhoneUtils.java
@@ -241,6 +241,7 @@
map.put("dnis", dnis);
map.put("call_uuid", call_uuid);
map.put("force_call", force_call);
+ map.put("fs_node_id", 8021);
if (force_call == null) map.put("force_call", true);
return sendReq(map, "/tel/ai_api/outbound");
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
index 472bc6c..a7cd97e 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
@@ -158,7 +158,7 @@
*/
@Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
@ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級")
- private Long isEnable;
+ private Long valueType;
/**
* 鍒犻櫎鏍囪
@@ -253,4 +253,11 @@
@Excel(name = "鏄惁蹇呭～锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�")
@ApiModelProperty(value = "鏄惁蹇呭～锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�")
private String isMust;
+
+ /**
+ * 闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級
+ */
+ @Excel(name = "闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級")
+ @ApiModelProperty(value = "闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級")
+ private String questionResult;
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
index 7eb27f1..e06bab6 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
@@ -158,7 +158,7 @@
*/
@Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
@ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級")
- private Long isEnable;
+ private Long valueType;
/**
* 鍒犻櫎鏍囪
@@ -255,6 +255,13 @@
private String isMust;
/**
+ * 闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級
+ */
+ @Excel(name = "闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級")
+ @ApiModelProperty(value = "闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級")
+ private String questionResult;
+
+ /**
* 璇濇湳閫夐」
*/
@ApiModelProperty(value = "璇濇湳閫夐」")
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTask.java b/smartor/src/main/java/com/smartor/domain/IvrTask.java
index adb7726..4fa72d1 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTask.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTask.java
@@ -31,7 +31,7 @@
*/
@Excel(name = "浠诲姟鍚嶇О ")
@ApiModelProperty(value = "浠诲姟鍚嶇О")
- private String taskname;
+ private String taskName;
/**
* 妯℃澘ID
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskSingleVO.java b/smartor/src/main/java/com/smartor/domain/IvrTaskSingleVO.java
index b8cd039..adf02c7 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskSingleVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskSingleVO.java
@@ -282,6 +282,20 @@
private Long isupload;
/**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private String patientid;
+
+ /**
+ * 鎮ｈ�呭鍚�
+ */
+ @Excel(name = "鎮ｈ�呭鍚�")
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patientname;
+
+ /**
* 涓婁紶鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index 5dde368..41c406a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -24,7 +24,7 @@
<result property="targetOptions" column="targetOptions"/>
<result property="language" column="language"/>
<result property="playWavOnly" column="playWavOnly"/>
- <result property="isEnable" column="isEnable"/>
+ <result property="valueType" column="value_type"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -42,6 +42,7 @@
<result property="nextQuestion" column="next_question"/>
<result property="otherdata" column="otherdata"/>
<result property="isMust" column="is_must"/>
+ <result property="questionResult" column="question_result"/>
</resultMap>
<sql id="selectIvrLibaTemplateScriptVo">
@@ -68,7 +69,8 @@
next_question,
otherdata,
is_must,
- targetOptions, language, playWavOnly, isEnable, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
+ question_result,
+ targetOptions, language, playWavOnly, value_type, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
from ivr_liba_template_script
</sql>
@@ -92,13 +94,14 @@
<if test="noClearlyVoice != null and noClearlyVoice != ''">and noClearlyVoice = #{noClearlyVoice}</if>
<if test="questiontitle != null and questiontitle != ''">and questiontitle = #{questiontitle}</if>
<if test="nextQuestion != null and nextQuestion != ''">and next_question = #{nextQuestion}</if>
+ <if test="questionResult != null and questionResult != ''">and question_result = #{questionResult}</if>
<if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
'%')
</if>
<if test="targetOptions != null and targetOptions != ''">and targetOptions = #{targetOptions}</if>
<if test="language != null and language != ''">and language = #{language}</if>
<if test="playWavOnly != null ">and playWavOnly = #{playWavOnly}</if>
- <if test="isEnable != null ">and isEnable = #{isEnable}</if>
+ <if test="valueType != null ">and value_type = #{valueType}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -139,7 +142,7 @@
<if test="targetOptions != null">targetOptions,</if>
<if test="language != null and language != ''">language,</if>
<if test="playWavOnly != null">playWavOnly,</if>
- <if test="isEnable != null">isEnable,</if>
+ <if test="valueType != null">value_type,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -157,6 +160,7 @@
<if test="nextQuestion != null">next_question,</if>
<if test="otherdata != null">otherdata,</if>
<if test="isMust != null and isMust != ''">is_must,</if>
+ <if test="questionResult != null and questionResult != ''">question_result,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateQuestionNum != null">#{templateQuestionNum},</if>
@@ -177,7 +181,7 @@
<if test="targetOptions != null">#{targetOptions},</if>
<if test="language != null and language != ''">#{language},</if>
<if test="playWavOnly != null">#{playWavOnly},</if>
- <if test="isEnable != null">#{isEnable},</if>
+ <if test="valueType != null">#{valueType},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -195,6 +199,7 @@
<if test="nextQuestion != null">#{nextQuestion},</if>
<if test="otherdata != null">#{otherdata},</if>
<if test="isMust != null and isMust != ''">#{isMust},</if>
+ <if test="questionResult != null and questionResult != ''">#{questionResult},</if>
</trim>
</insert>
@@ -219,7 +224,7 @@
<if test="targetOptions != null">targetOptions = #{targetOptions},</if>
<if test="language != null and language != ''">language = #{language},</if>
<if test="playWavOnly != null">playWavOnly = #{playWavOnly},</if>
- <if test="isEnable != null">isEnable = #{isEnable},</if>
+ <if test="valueType != null">value_type = #{valueType},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -237,6 +242,7 @@
<if test="nextQuestion != null">next_question = #{nextQuestion},</if>
<if test="otherdata != null">otherdata = #{otherdata},</if>
<if test="isMust != null and isMust != ''">is_must = #{isMust}</if>
+ <if test="questionResult != null and questionResult != ''">question_result = #{questionResult},</if>
</trim>
where ID = #{ID}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml
index c2dbe67..ab6674e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml
@@ -6,7 +6,7 @@
<resultMap type="com.smartor.domain.IvrTask" id="IvrTaskResult">
<result property="taskid" column="taskid"/>
- <result property="taskname" column="taskname"/>
+ <result property="taskName" column="taskname"/>
<result property="templateid" column="templateid"/>
<result property="templatename" column="templatename"/>
<result property="labelinfo" column="labelinfo"/>
@@ -82,7 +82,7 @@
<select id="selectIvrTaskList" parameterType="com.smartor.domain.IvrTask" resultMap="IvrTaskResult">
<include refid="selectIvrTaskVo"/>
<where>
- <if test="taskname != null and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if>
+ <if test="taskName != null and taskName != ''">and taskname like concat('%', #{taskName}, '%')</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
<if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
'%')
@@ -121,7 +121,7 @@
keyProperty="taskid">
insert into ivr_task
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="taskname != null">taskname,</if>
+ <if test="taskName != null">taskname,</if>
<if test="templateid != null">templateid,</if>
<if test="templatename != null">templatename,</if>
<if test="labelinfo != null">labelinfo,</if>
@@ -156,7 +156,7 @@
<if test="param != null">param,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="taskname != null">#{taskname},</if>
+ <if test="taskName != null">#{taskName},</if>
<if test="templateid != null">#{templateid},</if>
<if test="templatename != null">#{templatename},</if>
<if test="labelinfo != null">#{labelinfo},</if>
@@ -195,7 +195,7 @@
<update id="updateIvrTask" parameterType="com.smartor.domain.IvrTask">
update ivr_task
<trim prefix="SET" suffixOverrides=",">
- <if test="taskname != null">taskname = #{taskname},</if>
+ <if test="taskName != null">taskname = #{taskName},</if>
<if test="templateid != null">templateid = #{templateid},</if>
<if test="templatename != null">templatename = #{templatename},</if>
<if test="labelinfo != null">labelinfo = #{labelinfo},</if>
--
Gitblit v1.9.3