|
|
@@ -1420,16 +1420,30 @@ public class ApiController extends BaseController {
|
|
|
//ai外呼记录查询
|
|
|
private TableDataInfo getAiCallRecordsTable(ApiCallRecordQueryParams queryParams) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- params.put("calloutTimeStart", queryParams.getCalloutTimeStart());
|
|
|
- params.put("calloutTimeEnd", queryParams.getCalloutTimeEnd());
|
|
|
if (null != queryParams.getTimeLenStart()) {
|
|
|
- params.put("timeLenSecondStart", queryParams.getTimeLenStart().toString());
|
|
|
+ params.put("timeLenStart", queryParams.getTimeLenStart());
|
|
|
}
|
|
|
if (null != queryParams.getTimeLenEnd()) {
|
|
|
- params.put("timeLenSecondEnd", queryParams.getTimeLenEnd().toString());
|
|
|
+ params.put("timeLenEnd", queryParams.getTimeLenEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCalloutTimeStart()) {
|
|
|
+ params.put("calloutTimeStart", queryParams.getCalloutTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCalloutTimeEnd()) {
|
|
|
+ params.put("calloutTimeEnd", queryParams.getCalloutTimeEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getAnsweredTimeStart()) {
|
|
|
+ params.put("answeredTimeStart", queryParams.getAnsweredTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getAnsweredTimeEnd()) {
|
|
|
+ params.put("answeredTimeEnd", queryParams.getAnsweredTimeEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCallEndTimeStart()) {
|
|
|
+ params.put("callEndTimeStart", queryParams.getCallEndTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCallEndTimeEnd()) {
|
|
|
+ params.put("callEndTimeEnd", queryParams.getCallEndTimeEnd());
|
|
|
}
|
|
|
-
|
|
|
- startPage(queryParams.getPageNum(), queryParams.getPageSize());
|
|
|
CcCallPhone ccCallPhone = new CcCallPhone();
|
|
|
if (null != queryParams.getBatchId() && queryParams.getBatchId() > 0) {
|
|
|
ccCallPhone.setBatchId(queryParams.getBatchId());
|
|
|
@@ -1440,7 +1454,8 @@ public class ApiController extends BaseController {
|
|
|
ccCallPhone.setCallstatus(queryParams.getCallstatus());
|
|
|
ccCallPhone.setCallerNumber(queryParams.getCallerNumber());
|
|
|
ccCallPhone.setParams(params);
|
|
|
- List<CcCallPhone> list = ccCallPhoneService.selectCcCallPhoneList(ccCallPhone);
|
|
|
+ startPage(queryParams.getPageNum(), queryParams.getPageSize());
|
|
|
+ List<CcCallPhone> list = ccCallPhoneService.selectCcCallPhoneYlrzList(ccCallPhone);
|
|
|
list.forEach(callPhoneRecord -> {
|
|
|
if(StringUtils.isNotBlank(callPhoneRecord.getWavfile())){
|
|
|
if (callPhoneRecord.getWavfile().startsWith("/")) {
|
|
|
@@ -1449,28 +1464,53 @@ public class ApiController extends BaseController {
|
|
|
callPhoneRecord.setWavfile("/recordings/files?filename=" + callPhoneRecord.getWavfile());
|
|
|
}
|
|
|
}
|
|
|
+ callPhoneRecord.setCallstatusName( CcCallPhone.getCallStatusName(callPhoneRecord.getCallstatus()));
|
|
|
+ callPhoneRecord.setCalloutTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getCalloutTime())));
|
|
|
+ callPhoneRecord.setAnsweredTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getAnsweredTime())));
|
|
|
+ callPhoneRecord.setCallEndTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getCallEndTime())));
|
|
|
+ callPhoneRecord.setTimeLenSec(DateUtils.formatTimeLength(callPhoneRecord.getTimeLen()/1000));
|
|
|
});
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
//人工外呼记录查询
|
|
|
private TableDataInfo getOutboundRecordsTable(ApiCallRecordQueryParams queryParams) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- params.put("calloutTimeStart", queryParams.getCalloutTimeStart());
|
|
|
- params.put("calloutTimeEnd", queryParams.getCalloutTimeEnd());
|
|
|
if (null != queryParams.getTimeLenStart()) {
|
|
|
- params.put("timeLenSecondStart", queryParams.getTimeLenStart().toString());
|
|
|
+ params.put("timeLenStart", queryParams.getTimeLenStart());
|
|
|
}
|
|
|
if (null != queryParams.getTimeLenEnd()) {
|
|
|
- params.put("timeLenSecondEnd", queryParams.getTimeLenEnd().toString());
|
|
|
+ params.put("timeLenEnd", queryParams.getTimeLenEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCalloutTimeStart()) {
|
|
|
+ params.put("calloutTimeStart", queryParams.getCalloutTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getCalloutTimeEnd()) {
|
|
|
+ params.put("calloutTimeEnd", queryParams.getCalloutTimeEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getAnsweredTimeStart()) {
|
|
|
+ params.put("answeredTimeStart", queryParams.getAnsweredTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getAnsweredTimeEnd()) {
|
|
|
+ params.put("answeredTimeEnd", queryParams.getAnsweredTimeEnd());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getEndTimeStart()) {
|
|
|
+ params.put("endTimeStart", queryParams.getEndTimeStart());
|
|
|
+ }
|
|
|
+ if (null != queryParams.getEndTimeEnd()) {
|
|
|
+ params.put("endTimeEnd", queryParams.getEndTimeEnd());
|
|
|
+ }
|
|
|
+ CcCallPhone ccCallPhone = new CcCallPhone();
|
|
|
+ if (null != queryParams.getBatchId() && queryParams.getBatchId() > 0) {
|
|
|
+ ccCallPhone.setBatchId(queryParams.getBatchId());
|
|
|
}
|
|
|
|
|
|
- startPage(queryParams.getPageNum(), queryParams.getPageSize());
|
|
|
CcOutboundCdr outboundCdr = new CcOutboundCdr();
|
|
|
outboundCdr.setUuid(queryParams.getUuid());
|
|
|
outboundCdr.setCaller(queryParams.getTelephone());
|
|
|
outboundCdr.setOpnum(queryParams.getExtnum());
|
|
|
outboundCdr.setParams(params);
|
|
|
- List<CcOutboundCdr> list = outboundCdrService.selectCcOutboundCdrList(outboundCdr);
|
|
|
+ startPage(queryParams.getPageNum(), queryParams.getPageSize());
|
|
|
+ List<CcOutboundCdr> list = outboundCdrService.selectCcOutboundCdrYlrzList(outboundCdr);
|
|
|
list.forEach(callPhoneRecord -> {
|
|
|
if(StringUtils.isNotBlank(callPhoneRecord.getRecordFilename())){
|
|
|
if (callPhoneRecord.getRecordFilename().startsWith("/")) {
|
|
|
@@ -1478,6 +1518,11 @@ public class ApiController extends BaseController {
|
|
|
}else{
|
|
|
callPhoneRecord.setWavFileUrl("/recordings/files?filename=" + callPhoneRecord.getRecordFilename());
|
|
|
}
|
|
|
+ callPhoneRecord.setStartTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getStartTime())));
|
|
|
+ callPhoneRecord.setAnsweredTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getAnsweredTime())));
|
|
|
+ callPhoneRecord.setEndTimeStr(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date(callPhoneRecord.getEndTime())));
|
|
|
+ callPhoneRecord.setTimeLenSec(DateUtils.formatTimeLength(callPhoneRecord.getTimeLen()/1000));
|
|
|
+ callPhoneRecord.setTimeLenValidStr(DateUtils.formatTimeLength(callPhoneRecord.getTimeLenValid()/1000));
|
|
|
}
|
|
|
|
|
|
});
|
|
|
@@ -1505,4 +1550,14 @@ public class ApiController extends BaseController {
|
|
|
startPage(queryParams.getPageNum(), queryParams.getPageSize());
|
|
|
return getDataTable(ccGatewaysService.selectCcGatewaysList(queryParams));
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取外呼任务接通数据
|
|
|
+ * @param batchIds 任务id集合
|
|
|
+ */
|
|
|
+ @PostMapping("/task/connectSum")
|
|
|
+ @ResponseBody
|
|
|
+ public AjaxResult taskConnectSum(@RequestBody List<Long> batchIds){
|
|
|
+ return AjaxResult.success(ccCallPhoneService.statByBatchIds(batchIds));
|
|
|
+ }
|
|
|
}
|