acd 等待超时逻辑

src/core/callcenter/api.py

@@ -445,7 +445,7 @@ class CallInfo(BaseApi):
                  call_time=None, call_type=None, direction=None, answer_flag=None, wait_time=None, answer_count=0,
                  hangup_dir=None, sdk_hangup=0, hangup_code=None, answer_time=None, end_time=None, talk_time=None,
                  first_queue_time=None, queue_start_time=None, queue_end_time=None, overflow_count=0,
-                 uuid1=None, uuid2=None, cdr_notify_url=None, queue_level=None, transfer_agent=None, device_list=[],
+                 uuid1=None, uuid2=None, cdr_notify_url=None, queue_level=None, transfer_agent=None, user_no_answer_end_call=False, device_list=[],
                  device_info_map: Dict[str, Any] = {}, follow_data: Dict[str, Any] = {},
                  process_data: Dict[str, Any] = {}, next_commands=[], call_details=[]):
         self.core_uuid = core_uuid  # 通话唯一标识
@@ -492,6 +492,7 @@ class CallInfo(BaseApi):
         self.cdr_notify_url = cdr_notify_url  # 话单通知地址
         self.queue_level = queue_level  # 排队等级，默认是进队列时间
         self.transfer_agent = transfer_agent #是否转人工
+        self.user_no_answer_end_call = user_no_answer_end_call #用户未接听挂机
         self.device_list = device_list  # 当前通话的设备
         self.device_info_map = device_info_map
         self.follow_data = follow_data  # 呼叫随路数据(作为落单数据)
@@ -525,6 +526,7 @@ class CallInfo(BaseApi):
                    queue_end_time=data.get('queue_end_time'), overflow_count=data.get('overflow_count'),
                    uuid1=data.get('uuid1'), uuid2=data.get('uuid2'), cdr_notify_url=data.get('cdr_notify_url'),
                    queue_level=data.get('queue_level'), transfer_agent=data.get('transfer_agent'),
+                   user_no_answer_end_call=data.get('user_no_answer_end_call'),
                    device_list=data.get('device_list', []),device_info_map=device_info_map,
                    follow_data=follow_data, process_data=process_data,
                    next_commands=next_commands, call_details=call_details)
@@ -578,6 +580,7 @@ class CallInfo(BaseApi):
             "cdr_notify_url": self.cdr_notify_url,
             "queue_level": self.queue_level,
             "transfer_agent": self.transfer_agent,
+            "user_no_answer_end_call": self.user_no_answer_end_call,
             "device_list": [x for x in self.device_list],
             "device_info_map": {key: vars(value) for key, value in self.device_info_map.items()},
             "follow_data": {key: vars(value) for key, value in self.follow_data.items()},

src/core/callcenter/esl/client.py

@@ -165,8 +165,9 @@ class InboundClient:
             if device_info.device_type <= DeviceType.ROBOT.code:
                 call_info.hangup_dir = HangupDir.PLATFORM_HANGUP.code
                 call_info.hangup_code = CallCause.CALL_TIMEOUT.code
-            # if device_info.device_type.code == DeviceType.CUSTOMER.code:
-                # call_info.user_no_answer_end_call = True
+
+            if device_info.device_type.code == DeviceType.CUSTOMER.code:
+                call_info.user_no_answer_end_call = True
 
             if not device_info.end_time and device_info.device_type.code == DeviceType.CUSTOMER.code:
                 channel = self.show_channel(device_id)
@@ -181,7 +182,7 @@ class InboundClient:
         call_info = self.cache.get_call_info(call_id)
         if not call_info or not call_info.next_commands:
             return
-        self.logger.debug("播放结束音乐失败，进行挂机 callId:%s", call_id)
+        self.logger.info("播放结束音乐失败，进行挂机 callId:%s", call_id)
         next_types = [x.next_type for x in call_info.next_commands]
         if NextType.NEXT_HANGUP.code in next_types:
             for device_id in call_info.device_list:
@@ -201,6 +202,8 @@ class InboundClient:
                 return
             self.hold_play(device_id, WaitingHangupMusicPath)
             self.play_timeout(call_id, timeout=30)
+            next_command = NextCommand(device_id = device_id, next_type=NextType.NEXT_HANGUP.code)
+            call_info.next_commands = [next_command]
             self.cache.add_call_info(call_info)
             self.logger.info("waitingTimeOut 开始播放结束音乐 callId:%s customerDeviceId:%s playFile:%s", call_id,
                              device_id, WaitingHangupMusicPath)

src/core/callcenter/esl/handler/playback_stop_handler.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 # encoding:utf-8
 
+import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
+from src.core.callcenter.constant import HOLD_MUSIC_PATH
+from src.core.callcenter.enumeration import NextType, CallCause
 from src.core.callcenter.esl.annotation import EslEventName
 from src.core.callcenter.esl.constant.event_names import PLAYBACK_STOP
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
@@ -13,4 +16,28 @@ class PlaybackStopHandler(EslEventHandler):
         super().__init__(inbound_client, bot_agent)
 
     def handle(self, address, event, coreUUID):
-        pass
+        call_id = EslEventUtil.getCallId(event)
+        device_id = EslEventUtil.getDeviceId(event)
+        playback_file_path = EslEventUtil.getPlaybackFilePath(event)
+        if playback_file_path and HOLD_MUSIC_PATH == playback_file_path:
+            self.logger.info("等待音结束不需要处理 callId: %s deviceId: %s playbackFilePath: %s", call_id, device_id, playback_file_path);
+            return
+
+        call_info = self.cache.get_call_info(call_id)
+        if not call_info:
+            self.logger.info("PLAYBACK_STOP call_info:%s is null", call_id)
+            return
+        device_info = call_info.device_info_map.get(device_id)
+        if not device_info:
+            self.logger.info("PLAYBACK_STOP device_info:%s is null", device_id)
+            return
+        next_command = call_info.next_commands[0] if call_info.next_commands and len(call_info.next_commands) > 0 else None
+        if not next_command:
+            self.logger.info("PLAYBACK_STOP next_command is null, call_info:%s", call_info)
+            return
+
+        if NextType.NEXT_HANGUP == next_command.next_type:
+            call_info.end_time = device_info.end_time
+            for _device_id in call_info.device_list:
+                self.inbound_client.hangup_call(call_id, _device_id, CallCause.PLAYBACK_STOP)
+        self.cache.add_call_info(call_info)