From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 5ef354f..af8eeb2 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
@@ -6,8 +6,6 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
-import com.smartor.mapper.IvrLibaExtemplatescriptMapper;
-import com.smartor.service.IIvrLibaTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,28 +24,31 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.ruoyi.template.domain.IvrLibaExtemplatescript;
+import com.ruoyi.template.domain.IvrLibaTemplateScriptVO;
+import com.ruoyi.template.domain.IvrLibaTemplateVO;
+import com.ruoyi.template.api.TemplateFacade;
@Slf4j
@Component
public class ChatWebSocketHandler extends AbstractWebSocketHandler {
private static RedisCache redisCache;
- private static IIvrLibaTemplateService ivrLibaTemplateService;
+ /**
+ * 妯℃澘鏁版嵁涓�寰嬬粡 ruoyi-template 鐨勯棬闈㈠彇鐢紙璺ㄦā鍧楁暟鎹闂師鍒欙級銆�
+ * <p>
+ * 娌跨敤鏈被鍘熸湁鐨勩�宻tatic 瀛楁 + @Autowired setter銆嶈閰嶉鏍硷紝
+ * 涓嶆敼閫犳垚鏋勯�犳敞鍏� 鈥斺�� 閬垮厤褰卞搷杩欐潯宸叉湁鐨勮閰嶈矾寰勩��
+ */
+ private static TemplateFacade templateFacade;
- private static IvrLibaExtemplatescriptMapper ivrLibaExtemplatescriptMapper;
+ @Autowired
+ public void setTemplateFacade(TemplateFacade templateFacade) {
+ ChatWebSocketHandler.templateFacade = templateFacade;
+ }
// 鐢ㄤ簬瀛樺偍鐢ㄦ埛ID鍜學ebSocketSession鐨勬槧灏勫叧绯�
private static Map<String, WebSocketSession> sessions = new ConcurrentHashMap<>();
-
- @Autowired
- public void setIEMapper(IvrLibaExtemplatescriptMapper ivrLibaExtemplatescriptMapper) {
- ChatWebSocketHandler.ivrLibaExtemplatescriptMapper = ivrLibaExtemplatescriptMapper;
- }
-
- @Autowired
- public void setTodayReaderService(IIvrLibaTemplateService ivrLibaTemplateService) {
- ChatWebSocketHandler.ivrLibaTemplateService = ivrLibaTemplateService;
- }
@Autowired
public void setRedisCache(RedisCache redisCache) {
@@ -118,7 +119,12 @@
//閫氳繃妯℃澘ID鑾峰彇妯℃澘闂
IvrLibaTemplateVO ivrLibaTemplateVO = new IvrLibaTemplateVO();
ivrLibaTemplateVO.setId(socketMessage.getTemplateId());
- IvrLibaTemplateVO ivrLibaTemplateVO1 = ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO);
+ // 鈿狅笍 杩欓噷**鍒绘剰涓�**涓� TemplateModuleDisabledException 闄嶇骇锛�
+ // 璇煶闂嵎鏈韩灏辨槸妯℃澘椹卞姩鐨� 鈥斺�� 妯℃澘妯″潡鍏抽棴锛坰ys_config: template.enabled=false锛夋椂
+ // 杩欐瀵硅瘽娌℃湁浠讳綍闂鍙棶锛岀户缁蛋涓嬪幓鍙細鎷垮埌 null 鐒跺悗鍦ㄤ笅涓�琛� NPE銆�
+ // 鎶涘嚭鏄庣‘寮傚父锛堟彁绀�"妯℃澘鍔熻兘鏈惎鐢ㄢ��"锛夎繙濂戒簬涓�涓湅涓嶆噦鐨勭┖鎸囬拡锛�
+ // 涓斿紓甯镐細鐢� handleTextMessage 鎶涘嚭銆佺敱 WebSocket 瀹瑰櫒鏀跺彛銆�
+ IvrLibaTemplateVO ivrLibaTemplateVO1 = templateFacade.findIvrLibaTemplateInfoByCondition(ivrLibaTemplateVO);
redisCache.setCacheObject(userId + "ivrLibaTemplateVO1", ivrLibaTemplateVO1, 120, TimeUnit.MINUTES);
//灏嗘煡鍑烘潵鐨勯棶棰�,鏀惧埌鍏ㄥ眬鍙橀噺涓幓
List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = ivrLibaTemplateVO1.getIvrLibaTemplateScriptVOList();
@@ -167,7 +173,6 @@
}
//鑾峰彇妯℃澘淇℃伅
IvrLibaTemplateVO ivrLibaTemplateVO1 = redisCache.getCacheObject(userId + "ivrLibaTemplateVO1");
-
if (StringUtils.isEmpty(questionMessage.getContent())) {
//璋冪敤ivrTaskTemplateScriptVO涓殑slienceText(闈欓粯璇濇湳)
@@ -229,7 +234,9 @@
for (String str : list) {
list1.add(Long.valueOf(str));
}
- List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
+ // 鈿狅笍 涓庝笂闈㈤偅澶勪笉鍚岋細鏈柟娉曡繑鍥炵殑鏄�**鍒楄〃**锛岀┖鍒楄〃澶╃劧鍙閿�
+ // 锛堜笅闈㈢殑 for 寰幆涓�娆￠兘涓嶈繘锛夛紝鎵�浠ユā鏉挎ā鍧楀叧闂椂涓嶉渶瑕侀澶栭檷绾у垎鏀��
+ List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = templateFacade.findIvrLibaExtemplatescriptsByIds(list1);
IvrLibaExtemplatescript les = null;
for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
Matcher matcher = null;
@@ -272,7 +279,6 @@
}
}
}
-
//閫氳繃valueType鍒ゆ柇鏄粈涔堥鍨嬶紙鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級锛�
if (ivrLibaTemplateScriptVO.getValueType() == 2 || ivrLibaTemplateScriptVO.getValueType() == 3) {
@@ -420,7 +426,7 @@
// for (String str : list) {
// list1.add(Long.valueOf(str));
// }
-// List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
+// List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = templateFacade.findIvrLibaExtemplatescriptsByIds(list1);
// for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
// Matcher matcher = null;
// if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
--
Gitblit v1.9.3