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
86b47e12
authored
Sep 25, 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
8e13d73a
708467f5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
22 deletions
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
src/main/java/com/ctrip/fun/admin/service/system/UserDetailsService.java
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
View file @
86b47e12
...
...
@@ -115,6 +115,7 @@ public class SipPhoneControl {
// String agentAid = request.getAttribute("userName").toString();
String
agentAid
=
SpringSecurityUtil
.
getCurrentUserName
();
String
sipPhoneName
=
request
.
getParameter
(
"sipPhoneName"
);
System
.
out
.
println
(
"bbbbbbbbbbbbbbbbbbbbb:"
+
agentAid
+
" "
+
sipPhoneName
+
" "
);
return
sipPhoneService
.
bind
(
agentAid
,
sipPhoneName
);
}
...
...
@@ -228,6 +229,12 @@ public class SipPhoneControl {
String
srcGateway
=
null
;
String
srcAccessNumber
=
null
;
GetMobileInfoResponse
response
=
sipPhoneService
.
getMobileInfo
(
dst
);
//如果是上海的手机号码,不需加0,非上海手机号码, 需在手机号码前面加0代表区号
if
(
"0"
.
equals
(
response
.
getErrCode
())
&&
"021"
.
equals
(
response
.
getAreaCode
())){
}
else
{
dst
=
"0"
+
dst
;
}
//获得绑定的分机号码 分机A
AgentSipPhoneBindInfoResponse
bindInfo
=
sipPhoneService
.
getBindInfo
(
userName
,
null
);
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
View file @
86b47e12
...
...
@@ -20,13 +20,7 @@ import javax.websocket.server.ServerEndpoint;
public
class
NewStateWebSocket
{
public
NewStateWebSocket
(){}
private
static
NewStateWebSocket
single
=
null
;
public
static
NewStateWebSocket
getInstance
(){
if
(
single
==
null
){
single
=
new
NewStateWebSocket
();
}
return
single
;
}
private
static
Map
<
String
,
Session
>
sessionMap
=
new
HashMap
<
String
,
Session
>();
//在线的客户端session集合,只在第一次new的时候初始化。
/**
...
...
src/main/java/com/ctrip/fun/admin/service/system/UserDetailsService.java
View file @
86b47e12
...
...
@@ -71,21 +71,7 @@ public final class UserDetailsService extends BaseService implements org.springf
dbAuths
=
new
ArrayList
<
GrantedAuthority
>(
dbAuthsSet
);
}
/*//将当前用户添加到callcenter中的 Agent
AgentSipPhoneBindInfoResponse aspbiresp = sipPhoneService.getBindInfo(adminUserBean.getUserName(), null);
if("SUCCESS".equals( aspbiresp.getErrMsg()) &&StringUtils.isNotBlank(aspbiresp.getSipPhoneName())){
// adminUserBean.setSipPhone(aspbiresp.getSipPhoneName());
}else{
// Agent agent = new Agent();
// agent.setAgentName(adminUserBean.getUserName());
// agent.setAid(adminUserBean.getUserName());
// agent.setJobNumber((long)adminUserBean.getId());
// List<Agent> agentList = new ArrayList<Agent>();
// agentList.add(agent);
//同步Agent
sipPhoneService.agentSave(adminUserBean.getUserName(),adminUserBean.getUserName(), 0l);
}
*/
// Ruisheng ruisheng = new Ruisheng();
Runnable
myRunnable
=
new
Ruisheng
(
adminUserBean
);
Thread
ruishengThread
=
new
Thread
(
myRunnable
);
...
...
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