|
|
@ -100,7 +100,7 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
AllCallInfo allCallInfo = allCallInfoRepository.findBySessionId(sessionId);
|
|
|
|
AllCallInfo allCallInfo = allCallInfoRepository.findBySessionId(sessionId);
|
|
|
|
if (ObjectUtil.isNotEmpty(allCallInfo)) {
|
|
|
|
if (ObjectUtil.isNotEmpty(allCallInfo)) {
|
|
|
|
allCallInfo.setDuration(doubleCallBack.getDuration());
|
|
|
|
allCallInfo.setDuration(doubleCallBack.getDuration());
|
|
|
|
allCallInfo.setRecordFlag(doubleCallBack.getRecordFlag());
|
|
|
|
allCallInfo.setRecordFlag(doubleCallBack.getRecordFlag() == null ? DefaultNumberConstants.ZERO_NUMBER : doubleCallBack.getRecordFlag());
|
|
|
|
allCallInfo.setRecordFileDownloadUrl(doubleCallBack.getRecordFileDownloadUrl());
|
|
|
|
allCallInfo.setRecordFileDownloadUrl(doubleCallBack.getRecordFileDownloadUrl());
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -183,14 +183,16 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
public CommonResponse<String> rollCallReq(TelephoneCallReqDTO telephoneCallReqDTO) {
|
|
|
|
public CommonResponse<String> rollCallReq(TelephoneCallReqDTO telephoneCallReqDTO) {
|
|
|
|
String requestId = RandomUtil.randomString(10);
|
|
|
|
String requestId = RandomUtil.randomString(10);
|
|
|
|
telephoneCallReqDTO.setRequestId(requestId);
|
|
|
|
telephoneCallReqDTO.setRequestId(requestId);
|
|
|
|
//获取分机号
|
|
|
|
if (telephoneCallReqDTO.getDisplay() == null || telephoneCallReqDTO.getTelA() == null) {
|
|
|
|
ExtensionNumber extensionNumber = extensionNumberRepository.selectByMemberId(telephoneCallReqDTO.getMemberId());
|
|
|
|
//获取分机号
|
|
|
|
if (extensionNumber == null) {
|
|
|
|
ExtensionNumber extensionNumber = extensionNumberRepository.selectByMemberId(telephoneCallReqDTO.getMemberId());
|
|
|
|
log.error("未配置分机号");
|
|
|
|
if (extensionNumber == null) {
|
|
|
|
return CommonResponse.createByErrorMessage("未配置分机号");
|
|
|
|
log.error("未配置分机号");
|
|
|
|
|
|
|
|
return CommonResponse.createByErrorMessage("未配置分机号");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
telephoneCallReqDTO.setTelA(String.valueOf(extensionNumber.getNumber()));
|
|
|
|
|
|
|
|
telephoneCallReqDTO.setDisplay(extensionNumber.getDisplay());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
telephoneCallReqDTO.setTelA(String.valueOf(extensionNumber.getNumber()));
|
|
|
|
|
|
|
|
telephoneCallReqDTO.setDisplay(extensionNumber.getDisplay());
|
|
|
|
|
|
|
|
//获取线索号
|
|
|
|
//获取线索号
|
|
|
|
Clue body = sourceClueClient.queryDetails(Long.parseLong(telephoneCallReqDTO.getUserData())).getBody();
|
|
|
|
Clue body = sourceClueClient.queryDetails(Long.parseLong(telephoneCallReqDTO.getUserData())).getBody();
|
|
|
|
if (ObjectUtil.isNull(body) || StrUtil.isEmpty(body.getNid())) {
|
|
|
|
if (ObjectUtil.isNull(body) || StrUtil.isEmpty(body.getNid())) {
|
|
|
@ -226,6 +228,11 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
return CommonResponse.createBySuccess(requestId);
|
|
|
|
return CommonResponse.createBySuccess(requestId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 点呼回调 会得到两个,一个是针对分机号 一个是针对真实被叫 保存信息取值被叫回调,录音取分机号回调(被叫回调没有录音)
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param rollCallBackDTO
|
|
|
|
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void rollCallBack(RollCallBackDTO rollCallBackDTO) {
|
|
|
|
public void rollCallBack(RollCallBackDTO rollCallBackDTO) {
|
|
|
@ -250,4 +257,6 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
allCallInfoRepository.save(allCallInfo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|