|
|
@@ -3,7 +3,10 @@ package com.goafanti.customer.service.impl;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
+import com.goafanti.common.bo.InputCallCompleter;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.dao.AdminMapper;
|
|
|
+import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
import com.goafanti.common.dao.UserArchivesMapper;
|
|
|
import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.model.User;
|
|
|
@@ -34,6 +37,10 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<UserArchivesMapper>
|
|
|
private SystemWebSocketHandler systemWebSocketHandler;
|
|
|
@Resource
|
|
|
private UserMapper userMapper;
|
|
|
+ @Resource
|
|
|
+ private AdminMapper adminMapper;
|
|
|
+ @Resource
|
|
|
+ private OrganizationContactBookMapper organizationContactBookMapper;
|
|
|
|
|
|
@Override
|
|
|
public Object checkUser(Integer type) {
|
|
|
@@ -64,7 +71,7 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<UserArchivesMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Result callNumber(InputCallNumber in) {
|
|
|
+ public Result pushCallNumber(InputCallNumber in) {
|
|
|
String msg =null;
|
|
|
if (StringUtils.isNotBlank(in.getUid())){
|
|
|
User u =userMapper.queryById(in.getUid());
|
|
|
@@ -89,15 +96,18 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<UserArchivesMapper>
|
|
|
JSONObject result = jsonObject.getJSONObject("result");
|
|
|
msg = result.getString("msg");
|
|
|
if (StringUtils.isNotBlank(msg)){
|
|
|
+ if (msg.equals("成功")){
|
|
|
+// if (StringUtils.isNotBlank(in.getUid())){
|
|
|
+// User u =new User();
|
|
|
+// u.setId(in.getUid());
|
|
|
+// u.setCallStatus(1);
|
|
|
+// userMapper.update(u);
|
|
|
+// }
|
|
|
+ return new Result().data("呼叫成功");
|
|
|
+ }
|
|
|
return new Result().error(new Error(msg));
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(in.getUid())){
|
|
|
- User u =new User();
|
|
|
- u.setId(in.getUid());
|
|
|
- u.setCallStatus(1);
|
|
|
- userMapper.update(u);
|
|
|
- }
|
|
|
- return new Result().data("呼叫成功");
|
|
|
+ return new Result().error(new Error("通信异常"));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -121,9 +131,19 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<UserArchivesMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object callCompleted(Map<String, String[]> in) {
|
|
|
+ public Object callCompleted(InputCallCompleter in) {
|
|
|
//需要关闭客户呼叫中
|
|
|
systemWebSocketHandler.sendMessageToUser(TokenManager.getAdminId(), new TextMessage("callCompleted"));
|
|
|
return 1;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Object agentList() {
|
|
|
+ return adminMapper.agentList();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Object getDefaultMobile(String uid) {
|
|
|
+ return organizationContactBookMapper.getMajor(uid,null);
|
|
|
+ }
|
|
|
}
|