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
77b82015
authored
Sep 11, 2017
by
lyhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set sessionMap as sipPhone,Session
parent
214224e1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
12 deletions
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
src/main/webapp/WEB-INF/templates/common/navbar.ftl
src/main/webapp/resource/js/app/op.js
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
View file @
77b82015
...
...
@@ -75,8 +75,9 @@ public class NewStateEventHandler extends AbstractEventHandler {
String
mobileNo
=
event
.
getConnectedLineNumber
().
replaceFirst
(
"^0*"
,
""
);
// String username = SecurityContextHolder.getContext().getAuthentication().getName();
// UserDetails user = (UserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String
username
=
SpringSecurityUtil
.
getCurrentUserName
();
NewStateWebSocket
.
unicast
(
username
,
mobileNo
);
//String username = SpringSecurityUtil.getCurrentUserName();
String
callerIdNumber
=
event
.
getCallerIdNumber
();
NewStateWebSocket
.
unicast
(
callerIdNumber
,
mobileNo
);
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
View file @
77b82015
...
...
@@ -12,6 +12,11 @@ import javax.websocket.Session;
import
javax.websocket.server.PathParam
;
import
javax.websocket.server.ServerEndpoint
;
/**
* userName : 代表分机号
* @author lyhuang
*
*/
@ServerEndpoint
(
"/websocket/{userName}"
)
public
class
NewStateWebSocket
{
...
...
@@ -87,9 +92,10 @@ public class NewStateWebSocket {
public
static
void
unicast
(
String
username
,
String
mobileNo
)
{
String
message
=
"/system/user/"
+
mobileNo
+
"/detailByUid"
;
Session
session
=
sessionMap
.
get
(
username
);
NewStateWebSocket
socket
=
NewStateWebSocket
.
getInstance
();
//
NewStateWebSocket socket = NewStateWebSocket.getInstance();
try
{
socket
.
onMessage
(
message
,
session
,
username
);
session
.
getBasicRemote
().
sendText
(
message
);
//socket.onMessage(message, session, username);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
...
...
src/main/webapp/WEB-INF/templates/common/navbar.ftl
View file @
77b82015
<div class="navbar">
<input type="hidden" name="loginUsername" id="loginUsername" value="${Session["SPRING_SECURITY_CONTEXT"].authentication.name}" />
<input type="hidden" name="loginUsername" id="loginUsername" value='${Session["SPRING_SECURITY_CONTEXT"].authentication.name}' />
<div class="navbar-inner">
<a class="logo" href="/golf/course/list">主题游管理</a>
<ul class="nav">
...
...
src/main/webapp/resource/js/app/op.js
View file @
77b82015
...
...
@@ -15,6 +15,8 @@
webSocket
.
onopen
=
function
(
event
)
{
// document.getElementById("list").innerHTML="连接建立成功!";
// var msg = "username"+":"+loginUsername;
// webSocket.send(msg);
};
webSocket
.
onmessage
=
function
(
event
)
{
...
...
@@ -32,20 +34,22 @@
}
/*function sendMessage(
) {
var msg=document.getElementById("nickname").value+":"+document.getElementById("textarea").value;
document.getElementById("textarea").value="";
webSocket.send(msg);
}
*/
function
sendMessage
(
msg
)
{
//
var msg=document.getElementById("nickname").value+":"+document.getElementById("textarea").value;
//
document.getElementById("textarea").value="";
//
webSocket.send(msg);
}
$
(
document
).
ready
(
function
(
data
){
//查询绑定关系
var
loginUsername
=
$
(
"#loginUsername"
).
val
();
var
sipPhoneName
=
""
;
$
.
get
(
"/callcenter/sipPhone/getBindInfo?agentAid="
+
loginUsername
,{},
function
(
data
){
var
vhtml
=
""
;
sipPhoneName
=
data
.
sipPhoneName
;
if
(
data
.
errCode
==
0
&&
data
.
sipPhoneName
!=
0
){
vhtml
=
'<button class="btn btn-default btn-danger" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'
;
vhtml
+=
'已绑座机: '
+
data
.
sipPhoneName
;
vhtml
+=
'已绑座机: '
+
sipPhoneName
;
vhtml
+=
'<span class="caret"></span></button>'
;
vhtml
+=
'<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">'
;
vhtml
+=
'<li><a href="#" data-toggle="modal" data-target="#bindModal">重新绑定</a></li>'
;
...
...
@@ -57,7 +61,7 @@
}
$
(
".navbar .pull-right .dropdown"
).
html
(
vhtml
);
});
connectSocket
(
loginUsern
ame
);
connectSocket
(
sipPhoneN
ame
);
});
$
(
'#bindModal'
).
on
(
'show.bs.modal'
,
function
(
e
)
{
...
...
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