From bddaaa8f508e9343fe985b261c29cb33c07531f5 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Tue, 13 Nov 2018 16:32:22 +0800 Subject: [PATCH] =?UTF-8?q?#147=20=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5para?= =?UTF-8?q?ms=E5=88=B0=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=B6=88=E6=81=AFdata.ex?= =?UTF-8?q?pmsg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chatopera/cc/app/im/message/ChatMessage.java | 6 +++--- .../java/com/chatopera/cc/app/im/util/ChatbotUtils.java | 2 +- .../cc/concurrent/chatbot/ChatbotEventHandler.java | 3 +++ .../src/main/resources/templates/apps/im/chatbot/index.html | 2 ++ contact-center/config/sql/cskefu-MySQL-slim.sql | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/im/message/ChatMessage.java b/contact-center/app/src/main/java/com/chatopera/cc/app/im/message/ChatMessage.java index 75f9c6af..d09e0ca9 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/im/message/ChatMessage.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/im/message/ChatMessage.java @@ -70,7 +70,7 @@ public class ChatMessage implements java.io.Serializable ,UserEvent{ private boolean aichat ; //是否和AI提问 private String message ; - private String expmsg ; //显示消息 + private String expmsg ; // 语音消息时，显示为ASR的识别结果，文字消息时，显示为附带的动态业务字段 private String orgi ; private String channel ; @@ -103,8 +103,8 @@ public class ChatMessage implements java.io.Serializable ,UserEvent{ private String suggestmsg ; //推荐消息 private int tokenum ; //当前未读消息数量 - private String agentuser ; - + private String agentuser ; + public String getAppid() { return appid; } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/im/util/ChatbotUtils.java b/contact-center/app/src/main/java/com/chatopera/cc/app/im/util/ChatbotUtils.java index 960bdc1e..228ff5f9 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/im/util/ChatbotUtils.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/im/util/ChatbotUtils.java @@ -162,7 +162,7 @@ public class ChatbotUtils { * @param resp */ public static void saveAndPublish(ChatMessage resp) { - getChatMessageRes().save(resp); NettyClients.getInstance().sendChatbotEventMessage(resp.getUserid(), MainContext.MessageTypeEnum.MESSAGE.toString(), resp); + getChatMessageRes().save(resp); } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventHandler.java index 779a321c..2441f851 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventHandler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventHandler.java @@ -85,6 +85,9 @@ public class ChatbotEventHandler implements EventHandler { resp.setUserid(request.getUserid()); resp.setType(request.getType()); resp.setChannel(request.getChannel()); + if(data.has("params")){ + resp.setExpmsg(data.get("params").toString()); + } resp.setContextid(request.getContextid()); resp.setSessionid(request.getSessionid()); resp.setUsession(request.getUsession()); diff --git a/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html index ee208327..274f480d 100644 --- a/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html +++ b/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html @@ -491,6 +491,8 @@ socket.on('message', function(data) { var chat=document.getElementsByClassName('chatting-left').innerText; chat = data.message; + // console.log("On Server Message from Chatbot: ", chat, ", 动态参数：", data.expmsg); + if(data.messageType == "image"){ chat = "" ; }else if(data.messageType == "file"){ diff --git a/contact-center/config/sql/cskefu-MySQL-slim.sql b/contact-center/config/sql/cskefu-MySQL-slim.sql index 99a4bde0..fedb036b 100644 --- a/contact-center/config/sql/cskefu-MySQL-slim.sql +++ b/contact-center/config/sql/cskefu-MySQL-slim.sql @@ -1358,7 +1358,7 @@ CREATE TABLE `uk_chat_message` ( `msgtype` varchar(100) DEFAULT '' COMMENT '消息类型', `orgi` varchar(100) DEFAULT '' COMMENT '租户ID', `msgid` varchar(100) DEFAULT '' COMMENT '消息ID（微信）', - `expmsg` varchar(100) DEFAULT '' COMMENT '原始消息', + `expmsg` text DEFAULT '' COMMENT '原始消息', `name` varchar(255) DEFAULT NULL COMMENT '名称', `createtime` varchar(50) DEFAULT NULL COMMENT '创建时间', `creater` varchar(255) DEFAULT NULL COMMENT '创建人',