From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-phone/src/main/java/com/ruoyi/phone/service/impl/PhoneServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/ruoyi-phone/src/main/java/com/ruoyi/phone/service/impl/PhoneServiceImpl.java b/ruoyi-phone/src/main/java/com/ruoyi/phone/service/impl/PhoneServiceImpl.java
index 33123ee..4e52de5 100644
--- a/ruoyi-phone/src/main/java/com/ruoyi/phone/service/impl/PhoneServiceImpl.java
+++ b/ruoyi-phone/src/main/java/com/ruoyi/phone/service/impl/PhoneServiceImpl.java
@@ -18,9 +18,8 @@
import com.ruoyi.phone.domain.QuestionMessage;
import com.ruoyi.phone.service.IPhoneService;
import com.ruoyi.task.api.TaskSubtaskApi;
-import com.ruoyi.task.api.spi.TaskFtpPort;
-import com.ruoyi.task.api.spi.TaskPreachformPort;
-import com.ruoyi.task.api.spi.TaskSysConfigPort;
+import com.ruoyi.common.utils.FtpService;
+import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
import com.ruoyi.task.domain.IvrTaskVisitResult;
import com.ruoyi.task.domain.ServiceSubTaskDetailReq;
import com.ruoyi.task.domain.ServiceSubtask;
@@ -60,6 +59,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import com.ruoyi.system.service.ISysConfigService;
/**
* 鐢佃瘽涓氬姟Service瀹炵幇锛堝師 {@code ruoyi-task} 閲� {@code ServiceSubtaskServiceImpl} 鐨勭數璇濋儴鍒嗭級銆�
@@ -110,19 +110,21 @@
* 璇ヨ〃褰� ruoyi-inhospvisit锛岀敱 smartor 渚ч�傞厤瀹炵幇鏈鍙ｃ��
*/
@Autowired
- private TaskPreachformPort taskPreachformPort;
+ private ServiceSubtaskPreachformMapper taskPreachformPort;
/**
* 褰曢煶鏂囦欢涓嬭浇锛堥洦缁�氳瘽璁板綍鍥炶皟閲屾妸褰撳ぉ褰曢煶浠� FTP 鎷夊洖鏈湴锛�
+ * <p>2026-11锛歿@code FtpService} 宸蹭粠 smartor 涓嬫矇鍒� {@code ruoyi-common}锛�
+ * 鍘熸潵鐨勮繃娓＄鍙� {@code TaskFtpPort} 闅忎箣鍒犻櫎锛岃繖閲岀洿鎺ユ敞鍏ラ�氱敤宸ュ叿銆�
*/
@Autowired
- private TaskFtpPort taskFtpPort;
+ private FtpService ftpService;
/**
* 鍙傛暟閰嶇疆璇诲彇锛坽@code sys.voice.match.ai.url}锛欰I 閫夐」鍖归厤鏈嶅姟鍦板潃锛屾寜鏈烘瀯閰嶇疆锛�
*/
@Autowired
- private TaskSysConfigPort taskSysConfigPort;
+ private ISysConfigService sysConfigService;
/**
* AI 閫夐」鍖归厤濂戠害锛坮uoyi-common锛屽疄鐜板湪 ruoyi-task锛屽嵆鍘� {@code matchOptionIndex}锛�
@@ -700,7 +702,7 @@
//鐢ㄦ潵鏍囪锛屾槸鍚︽湁鍖归厤涓婄殑
Integer flag = 0;
//1-AI璇嗗埆
- String url = taskSysConfigPort.selectConfigValue("sys.voice.match.ai.url", phoneCallReqYQVO.getOrgid());
+ String url = sysConfigService.selectConfigByKey("sys.voice.match.ai.url", phoneCallReqYQVO.getOrgid());
if (ObjectUtils.isNotEmpty(url)) {
PhoneCallBackYQVO aiMatchResult = AiMatch(url, phoneCallReqYQVO, phoneCallBackYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate, ivrTaskTemplateScripts, scriptId, flag, phoneCallReqYQVO.getUuid());
@@ -1234,7 +1236,7 @@
}
private List<PullTaskVO> getPullTaskList(List<String> subIds, String cacheName) {
- log.error("浠诲姟鎷夊彇subIds鐨勫�兼槸澶氬皯锛歿}", subIds);
+ log.info("浠诲姟鎷夊彇subIds鐨勫�兼槸澶氬皯锛歿}", subIds);
//pullTaskVOList鐢ㄤ簬鏁版嵁杩斿洖
List<PullTaskVO> pullTaskVOList = new ArrayList<>();
//newValue0鐢ㄤ簬淇濆瓨娌℃湁澶勭悊鐨勫瓙 浠诲姟
@@ -1259,14 +1261,18 @@
taskSubtaskApi.updateSubtask(serviceSubtask);
continue;
}
+ log.info("serviceSubtask.getTaskid()鏈夊�煎悧锛燂紵锛焮}",serviceSubtask.getTaskid());
ServiceTask serviceTask = taskSubtaskApi.getTask(serviceSubtask.getTaskid());
+ log.info("serviceTask鏈夊�煎悧锛燂紵锛焮}",serviceTask);
IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(serviceSubtask.getTemplateid());
+ log.info("ivrTaskTemplate鏈夊�煎悧锛燂紵锛焮}",ivrTaskTemplate);
if (ObjectUtils.isEmpty(ivrTaskTemplate)) continue;
//閫氳繃浠诲姟妯℃澘涓殑"绗竴娆￠棶棰樼紪鍙�"鑾峰彇绗竴涓棶棰�;
IvrTaskTemplateScript ivrTaskTemplateScript = null;
IvrTaskTemplateScript ivrTaskTemplateScript1 = new IvrTaskTemplateScript();
ivrTaskTemplateScript1.setTemplateID(ivrTaskTemplate.getId());
List<IvrTaskTemplateScript> ivrTaskTemplateScripts = iIvrTaskTemplateScriptService.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript1);
+ log.info("ivrTaskTemplateScripts鏈夊�煎悧锛燂紵锛焮}",ivrTaskTemplateScripts.size());
aa:
for (IvrTaskTemplateScript ivrTaskTemplateScript2 : ivrTaskTemplateScripts) {
if (ivrTaskTemplate.getFirstQuestionNum() == Long.valueOf(ivrTaskTemplateScript2.getSort())) {
@@ -1276,7 +1282,7 @@
}
//濡傛灉ivrTaskTemplateScript涓虹┖锛屼篃灏辨病鏈夊線涓嬫墽琛岀殑蹇呰浜�
if (ObjectUtils.isEmpty(ivrTaskTemplateScript)) {
- log.error("---------杩欎釜ivrTaskTemplate.getId()鐨勯棶棰樹负绌猴細{}", ivrTaskTemplate.getId());
+ log.info("---------杩欎釜ivrTaskTemplate.getId()鐨勯棶棰樹负绌猴細{}", ivrTaskTemplate.getId());
continue;
}
//鑾峰彇閫氶厤绗﹀尮閰嶈繃鍚庣殑闂
@@ -1284,7 +1290,7 @@
if (StringUtils.isEmpty(scriptContent)) scriptContent = ivrTaskTemplateScript.getScriptContent();
String scrContent = getObject(serviceSubtask, scriptContent);
String kcb = serviceTask.getKcb() + "," + scrContent;
-
+ log.info("---------杩欎釜kcb鏄暐锛歿}", kcb);
//灏佽杩斿洖鏁版嵁
//taskId = 瀛愪换鍔D + 闂ID +闂搴忓彿
pullTaskVO.setTaskid(subId);
@@ -1295,13 +1301,14 @@
if (cacheName.equals("cache-0")) pullTaskVO.setDisplayNo("2");
else pullTaskVO.setDisplayNo("2");
pullTaskVOList.add(pullTaskVO);
+ log.info("---------杩欎釜pullTaskVO鏄暐锛歿}", pullTaskVO);
redisCache.setCacheObject(subId.trim() + "-" + serviceSubtask.getPhone().trim(), ivrTaskTemplateScript.getId().toString(), 120, TimeUnit.MINUTES);
} else {
newValue0.add(subIds.get(i));
redisCache.setCacheListRight(cacheName, newValue0);
}
}
-
+ log.info("111111111浠诲姟鎷夊彇pullTaskVOList鐨勫�兼槸澶氬皯锛歿}", pullTaskVOList);
return pullTaskVOList;
}
@@ -1410,7 +1417,7 @@
taskSubtaskApi.updateSubtask(serviceSubtask);
setFailPreachForm(serviceSubtask, StringUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) ? serviceSubtask.getCurrentPreachform() : "3", "鐢佃瘽鎷ㄦ墦宸插畬鎴�", "9");
//涓嬭浇鏂囦欢
- taskFtpPort.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
+ ftpService.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
redisCache.deleteObject(phoneCallRecordVO.getTaskid() + "recordAccept-hungup");
} else {
//鎮ｈ�呮嫆缁濋殢璁�
@@ -1647,7 +1654,7 @@
public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallResultYQVO) {
PhoneCallBackSHVO phoneCallBackSHVO = new PhoneCallBackSHVO();
//閫氳繃scriptid锛岃幏鍙栨墍鏈夌殑缁撴灉
- String url = taskSysConfigPort.selectConfigValue("sys.voice.match.ai.url", phoneCallResultYQVO.getOrgid());
+ String url = sysConfigService.selectConfigByKey("sys.voice.match.ai.url", phoneCallResultYQVO.getOrgid());
ServiceSubtask serviceSubtask = taskSubtaskApi.getSubtask(phoneCallResultYQVO.getSubId());
IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(serviceSubtask.getTemplateid());
IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = iIvrTaskTemplateScriptService.getTaskTempScriptInfoByid(Long.valueOf(phoneCallResultYQVO.getScriptId()));
--
Gitblit v1.9.3