|
|
|
@ -81,26 +81,10 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
|
}
|
|
|
|
|
doubleCallReq.setTelB(body.getNid());
|
|
|
|
|
String sessionId = this.doubleCallReq.startReq(doubleCallReq);
|
|
|
|
|
log.info("=============================sessionId {}", sessionId);
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(sessionId)) {
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo();
|
|
|
|
|
allCallInfo.setSessionId(sessionId);
|
|
|
|
|
allCallInfo.setRequestId(requestId);
|
|
|
|
|
allCallInfo.setClueId(Long.parseLong(doubleCallReq.getUserData()));
|
|
|
|
|
allCallInfo.setClueType(doubleCallReq.getClueType());
|
|
|
|
|
allCallInfo.setMemberId(doubleCallReq.getMemberId());
|
|
|
|
|
allCallInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
allCallInfo.setType(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo();
|
|
|
|
|
clueInfo.setClueId(Long.parseLong(doubleCallReq.getUserData()));
|
|
|
|
|
clueInfo.setTeamId(doubleCallReq.getTeamId());
|
|
|
|
|
clueInfo.setMemberId(doubleCallReq.getMemberId());
|
|
|
|
|
clueInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
clueInfo.setTaskId(doubleCallReq.getTaskId());
|
|
|
|
|
clueInfo.setCompanyId(companyId);
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo().init(sessionId, requestId, Long.parseLong(doubleCallReq.getUserData()), doubleCallReq.getClueType(), doubleCallReq.getMemberId(), DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo().init(Long.parseLong(doubleCallReq.getUserData()), doubleCallReq.getTeamId(), doubleCallReq.getMemberId(), doubleCallReq.getTaskId(), companyId, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
callClueRepository.save(clueInfo);
|
|
|
|
|
} else {
|
|
|
|
|
return CommonResponse.createByError();
|
|
|
|
@ -172,23 +156,9 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
|
doubleCallReq.setTelB(nid);
|
|
|
|
|
String sessionId = axbRequest.call(doubleCallReq);
|
|
|
|
|
if (CharSequenceUtil.isNotBlank(sessionId)) {
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo();
|
|
|
|
|
allCallInfo.setSessionId(sessionId);
|
|
|
|
|
allCallInfo.setRequestId(randomString);
|
|
|
|
|
allCallInfo.setClueId(originalNumber);
|
|
|
|
|
allCallInfo.setClueType(doubleCallReq.getClueType());
|
|
|
|
|
allCallInfo.setMemberId(doubleCallReq.getMemberId());
|
|
|
|
|
allCallInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
allCallInfo.setType(DefaultNumberConstants.THREE_NUMBER);
|
|
|
|
|
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo();
|
|
|
|
|
clueInfo.setClueId(originalNumber);
|
|
|
|
|
clueInfo.setTeamId(doubleCallReq.getTeamId());
|
|
|
|
|
clueInfo.setMemberId(doubleCallReq.getMemberId());
|
|
|
|
|
clueInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
clueInfo.setTaskId(doubleCallReq.getTaskId());
|
|
|
|
|
clueInfo.setCompanyId(companyId);
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo().init(sessionId, randomString, originalNumber, doubleCallReq.getClueType(), doubleCallReq.getMemberId(), DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.THREE_NUMBER);
|
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo().init(originalNumber, doubleCallReq.getTeamId(), doubleCallReq.getMemberId(), doubleCallReq.getTaskId(), companyId, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
callClueRepository.save(clueInfo);
|
|
|
|
|
TelephoneCallStopDTO telephoneCallStopDTO = new TelephoneCallStopDTO();
|
|
|
|
|
telephoneCallStopDTO.setSessionid(sessionId);
|
|
|
|
@ -260,27 +230,12 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
|
//请求呼叫
|
|
|
|
|
String reqId = rollCallReq.startReq(telephoneCallReqDTO);
|
|
|
|
|
|
|
|
|
|
//保存呼叫记录
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo();
|
|
|
|
|
clueInfo.setClueId(Long.parseLong(telephoneCallReqDTO.getUserData()));
|
|
|
|
|
clueInfo.setTeamId(telephoneCallReqDTO.getTeamId());
|
|
|
|
|
clueInfo.setMemberId(telephoneCallReqDTO.getMemberId());
|
|
|
|
|
clueInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
clueInfo.setTaskId(telephoneCallReqDTO.getTaskId());
|
|
|
|
|
clueInfo.setCompanyId(companyId);
|
|
|
|
|
callClueRepository.save(clueInfo);
|
|
|
|
|
//保存呼叫详情
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo();
|
|
|
|
|
allCallInfo.setSessionId(requestId);
|
|
|
|
|
allCallInfo.setRequestId(requestId);
|
|
|
|
|
allCallInfo.setClueId(Long.parseLong(telephoneCallReqDTO.getUserData()));
|
|
|
|
|
allCallInfo.setClueType(telephoneCallReqDTO.getClueType());
|
|
|
|
|
allCallInfo.setMemberId(telephoneCallReqDTO.getMemberId());
|
|
|
|
|
allCallInfo.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
allCallInfo.setType(DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
allCallInfo.setRecordFlag(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
AllCallInfo allCallInfo = new AllCallInfo().init(requestId, requestId, Long.parseLong(telephoneCallReqDTO.getUserData()), telephoneCallReqDTO.getClueType(), telephoneCallReqDTO.getMemberId(), DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
|
|
|
|
|
|
CallClueInfo clueInfo = new CallClueInfo().init(Long.parseLong(telephoneCallReqDTO.getUserData()), telephoneCallReqDTO.getTeamId(), telephoneCallReqDTO.getMemberId(), telephoneCallReqDTO.getTaskId(), companyId, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
callClueRepository.save(clueInfo);
|
|
|
|
|
|
|
|
|
|
TelephoneCallStopDTO telephoneCallStopDTO = new TelephoneCallStopDTO();
|
|
|
|
|
telephoneCallStopDTO.setSessionid(reqId);
|
|
|
|
|
telephoneCallStopDTO.setCallId(requestId);
|
|
|
|
|