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
c699374a
authored
Sep 27, 2017
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unused comment
parent
d8b8354d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 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/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
View file @
c699374a
...
...
@@ -128,7 +128,6 @@ 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 @
c699374a
...
...
@@ -40,7 +40,6 @@ 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
.
getChannel
().
substring
(
4
,
8
);
NewStateWebSocket
.
unicast
(
callerIdNumber
,
mobileNo
);
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
View file @
c699374a
...
...
@@ -14,14 +14,11 @@ import javax.websocket.server.ServerEndpoint;
/**
* userName : 代表分机号
* @author lyhuang
*
*/
@ServerEndpoint
(
"/websocket/{userName}"
)
public
class
NewStateWebSocket
{
public
NewStateWebSocket
(){}
private
static
Map
<
String
,
Session
>
sessionMap
=
new
HashMap
<
String
,
Session
>();
//在线的客户端session集合,只在第一次new的时候初始化。
/**
* 接收信息事件
...
...
@@ -50,10 +47,8 @@ public class NewStateWebSocket {
*/
@OnOpen
public
void
onOpen
(
Session
session
,
@PathParam
(
value
=
"userName"
)
String
userName
)
throws
Exception
{
System
.
out
.
println
(
"打开连接成功!"
);
sessionMap
.
put
(
userName
,
session
);
System
.
out
.
println
(
"用户"
+
userName
+
"进来了。。。"
);
System
.
out
.
println
(
"当前在线人数:"
+
sessionMap
.
size
());
// System.out.println("用户"+userName+"进来了。。。"+"当前在线人数:"+sessionMap.size());
}
/**
...
...
@@ -61,10 +56,8 @@ public class NewStateWebSocket {
*/
@OnClose
public
void
onClose
(
Session
session
,
@PathParam
(
value
=
"userName"
)
String
userName
)
{
System
.
out
.
println
(
"关闭连接成功!"
);
System
.
out
.
println
(
"用户"
+
userName
+
"离开了。。。"
);
// System.out.println("用户"+userName+"离开了。。。"+"当前在线人数:"+sessionMap.size());
sessionMap
.
remove
(
userName
);
System
.
out
.
println
(
"当前在线人数:"
+
sessionMap
.
size
());
}
/**
...
...
@@ -83,11 +76,8 @@ public class NewStateWebSocket {
public
static
void
unicast
(
String
username
,
String
mobileNo
)
{
String
message
=
"/system/user/"
+
mobileNo
+
"/detailByUid"
;
Session
session
=
sessionMap
.
get
(
username
);
System
.
out
.
println
(
"unicast--------------------------------------------------"
+
message
);
// NewStateWebSocket socket = NewStateWebSocket.getInstance();
try
{
session
.
getBasicRemote
().
sendText
(
message
);
// socket.onMessage(message, session, username);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
...
...
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