Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
52a7c1c2
authored
Sep 28, 2017
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release' of 192.168.10.6:caosy/fun-admin into release
parents
622a8545
d8b8354d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
14 deletions
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
src/main/webapp/resource/js/app/op.js
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
View file @
52a7c1c2
...
...
@@ -128,6 +128,7 @@ public class CallCenterController {
// 1)找出具体的命令实例。
logger
.
debug
(
"event ["
+
event
+
"] is ready to execute..."
);
logger
.
debug
(
eventJsonString
);
System
.
out
.
println
(
"EEEEEEEEEEEEEEEEEEEEEEEEEEEEE: "
+
eventJsonString
);
AbstractEventHandler
eventHandler
=
eventHandlerMap
.
get
(
event
);
// 2)执行命令并返回结果
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
View file @
52a7c1c2
...
...
@@ -15,8 +15,8 @@ import com.ctrip.fun.admin.vo.callcenter.RsmwNewStateEvent;
*
* ringing时弹屏, down时话后
*
* @author jyf
*
* @author jyf
*/
@Controller
public
class
NewStateEventHandler
extends
AbstractEventHandler
{
...
...
@@ -40,7 +40,9 @@ public class NewStateEventHandler extends AbstractEventHandler {
logger
.
debug
(
"收到了ringing消息: "
+
event
.
getChannel
()
+
event
.
getConnectedLineNumber
());
//来电手机号码
String
mobileNo
=
event
.
getConnectedLineNumber
().
replaceFirst
(
"^0*"
,
""
);
String
callerIdNumber
=
event
.
getCallerIdNumber
();
// String callerIdNumber = event.getCallerIdNumber();
String
callerIdNumber
=
event
.
getChannel
().
substring
(
4
,
8
);
NewStateWebSocket
.
unicast
(
callerIdNumber
,
mobileNo
);
}
return
""
;
...
...
src/main/webapp/resource/js/app/op.js
View file @
52a7c1c2
...
...
@@ -6,19 +6,13 @@
url
+=
sipPhoneName
;
if
(
webSocket
==
null
){
webSocket
=
new
WebSocket
(
url
);
webSocket
.
onerror
=
function
(
event
)
{};
webSocket
.
onopen
=
function
(
event
)
{};
webSocket
.
onmessage
=
function
(
event
)
{
window
.
open
(
event
.
data
,
"用户来电通知"
);
};
webSocket
.
onclose
=
function
(
event
){};
}
webSocket
.
onerror
=
function
(
event
)
{
};
webSocket
.
onopen
=
function
(
event
)
{
};
webSocket
.
onmessage
=
function
(
event
)
{
window
.
open
(
event
.
data
,
"用户来电通知"
);
};
webSocket
.
onclose
=
function
(
event
){
};
}
//关闭Socket
function
closeSocket
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment