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
8ac26110
authored
Oct 19, 2017
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
呼叫弹框功能实现
parent
0889bf51
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
6 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/controller/tools/CallCenterController.java
View file @
8ac26110
...
@@ -43,6 +43,7 @@ import com.ctrip.fun.admin.service.system.UserService;
...
@@ -43,6 +43,7 @@ import com.ctrip.fun.admin.service.system.UserService;
import
com.ctrip.fun.admin.service.tools.CallCenterService
;
import
com.ctrip.fun.admin.service.tools.CallCenterService
;
import
com.ctrip.fun.admin.utility.Util
;
import
com.ctrip.fun.admin.utility.Util
;
import
com.ctrip.fun.admin.vo.callcenter.AbstractEventHandler
;
import
com.ctrip.fun.admin.vo.callcenter.AbstractEventHandler
;
import
com.ctrip.fun.admin.vo.callcenter.RsmwNewStateEvent
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.basic.UserExtQuery
;
import
com.ctrip.fun.common.vo.basic.UserExtQuery
;
import
com.ctrip.fun.common.vo.user.RegisterBean
;
import
com.ctrip.fun.common.vo.user.RegisterBean
;
...
@@ -126,7 +127,7 @@ public class CallCenterController {
...
@@ -126,7 +127,7 @@ public class CallCenterController {
JSONObject
commandJSONObject
=
null
;
JSONObject
commandJSONObject
=
null
;
commandJSONObject
=
JSON
.
parseObject
(
eventJsonString
);
commandJSONObject
=
JSON
.
parseObject
(
eventJsonString
);
String
event
=
commandJSONObject
.
getString
(
"event"
);
String
event
=
commandJSONObject
.
getString
(
"event"
);
System
.
out
.
println
(
"bbbbbbbbbbb: "
+
event
);
if
(
StringUtils
.
isBlank
(
event
)){
if
(
StringUtils
.
isBlank
(
event
)){
result
=
"收到的消息缺少event字段: "
+
eventJsonString
;
result
=
"收到的消息缺少event字段: "
+
eventJsonString
;
logger
.
warn
(
result
);
logger
.
warn
(
result
);
...
@@ -139,7 +140,24 @@ public class CallCenterController {
...
@@ -139,7 +140,24 @@ public class CallCenterController {
// 2)执行命令并返回结果
// 2)执行命令并返回结果
if
(
eventHandler
!=
null
){
if
(
eventHandler
!=
null
){
if
(
"newStateEvent"
.
equals
(
event
)){
RsmwNewStateEvent
event111
=
JSON
.
toJavaObject
(
commandJSONObject
,
RsmwNewStateEvent
.
class
);
// String sipPeerName = event111.getChannel().replace("SIP/", "");
if
(
"RINGING"
.
equals
(
event111
.
getChannelState
()))
{
String
mobileNo
=
event111
.
getConnectedLineNumber
().
replaceFirst
(
"^0*"
,
""
);
String
callerIdNumber
=
event111
.
getChannel
().
substring
(
4
,
8
);
UserExtBean
user
=
userService
.
getUserByMobile
(
mobileNo
);
String
uid
=
""
;
if
(
user
!=
null
){
uid
=
user
.
getUid
();
}
NewStateEventHandler
newStatehandler
=
new
NewStateEventHandler
();
newStatehandler
.
handle
(
callerIdNumber
,
uid
,
mobileNo
);
}
}
else
{
eventHandler
.
handle
(
commandJSONObject
);
eventHandler
.
handle
(
commandJSONObject
);
}
return
"Success"
;
return
"Success"
;
}
else
{
}
else
{
result
=
"event="
+
event
+
", event字段有误,没有找到对应的eventHandler"
;
result
=
"event="
+
event
+
", event字段有误,没有找到对应的eventHandler"
;
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
View file @
8ac26110
...
@@ -21,13 +21,18 @@ import com.ctrip.fun.common.vo.user.UserExtBean;
...
@@ -21,13 +21,18 @@ import com.ctrip.fun.common.vo.user.UserExtBean;
*
*
* @author jyf
* @author jyf
*/
*/
@Controller
public
class
NewStateEventHandler
extends
AbstractEventHandler
{
public
class
NewStateEventHandler
extends
AbstractEventHandler
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
());
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
());
@Autowired
// private String uid;
private
UserService
userService
;
public
void
handle
(
String
callerIdNumber
,
String
uid
,
String
mobileNo
)
{
// this.uid = uid;
// this.handle(jsonObject);
NewStateWebSocket
.
unicast
(
callerIdNumber
,
uid
,
mobileNo
);
}
@Override
@Override
public
String
handle
(
JSONObject
jsonObject
)
{
public
String
handle
(
JSONObject
jsonObject
)
{
...
@@ -43,7 +48,7 @@ public class NewStateEventHandler extends AbstractEventHandler {
...
@@ -43,7 +48,7 @@ public class NewStateEventHandler extends AbstractEventHandler {
sipPeerName
=
sipPeerName
.
split
(
"/"
)[
0
];
sipPeerName
=
sipPeerName
.
split
(
"/"
)[
0
];
if
(
"RINGING"
.
equals
(
event
.
getChannelState
()))
{
if
(
"RINGING"
.
equals
(
event
.
getChannelState
()))
{
logger
.
debug
(
"收到了ringing消息: "
+
event
.
getChannel
()
+
event
.
getConnectedLineNumber
());
/*
logger.debug("收到了ringing消息: " + event.getChannel() + event.getConnectedLineNumber());
//来电手机号码
//来电手机号码
String mobileNo = event.getConnectedLineNumber().replaceFirst("^0*", "");
String mobileNo = event.getConnectedLineNumber().replaceFirst("^0*", "");
String callerIdNumber = event.getChannel().substring(4, 8);
String callerIdNumber = event.getChannel().substring(4, 8);
...
@@ -56,7 +61,7 @@ public class NewStateEventHandler extends AbstractEventHandler {
...
@@ -56,7 +61,7 @@ public class NewStateEventHandler extends AbstractEventHandler {
NewStateWebSocket
.
unicast
(
callerIdNumber
,
uid
,
mobileNo
);
NewStateWebSocket.unicast(callerIdNumber,uid,mobileNo);
*/
}
}
return
""
;
return
""
;
}
}
...
...
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