fix:bug

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

@@ -4,7 +4,7 @@ import json
 import time
 from datetime import datetime
 from src.core.callcenter.constant import saasId, get_record_prefix
-from src.core.callcenter.enumeration import NextType, AnswerFlag, Direction, DeviceType, AgentScene, CdrType
+from src.core.callcenter.enumeration import NextType, AnswerFlag, Direction, DeviceType, AgentScene, CdrType,WorkStatus,AgentServiceState
 from src.core.callcenter.esl.annotation import EslEventName
 import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
 from src.core.callcenter.esl.constant.event_names import CHANNEL_ANSWER
@@ -47,6 +47,10 @@ class ChannelAnswerHandler(EslEventHandler):
         call_info.answer_count = call_info.answer_count + 1
         call_info.next_commands.remove(next_command)
 
+        if not call_info.answer_time:
+            call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)
+            self.dataHandleServer.update_record(call_id, {"status": 1})
+
         if NextType.NEXT_CALL_OTHER.code == next_command.next_type:
             self.call_other(call_info, device_info)
         elif NextType.NEXT_CALL_BRIDGE.code == next_command.next_type:
@@ -59,6 +63,9 @@ class ChannelAnswerHandler(EslEventHandler):
             self.logger.warn("can not match command :%s, callId :%s", next_command.next_type, call_id)
         self.cache.add_call_info(call_info)
 
+        if device_info.device_type == DeviceType.AGENT.code:  # 如果是坐席接听 变更坐席状态
+            self.push_handler.push_on_agent_work_report(call_info.saas_id, call_info.cti_flow_id, call_info.agent_key, call_info.call_id, AgentScene.ROBOT, WorkStatus.AGENT_ANSWER_INCOMING)
+            self.dataHandleServer.update_agent_monitor_service_state(call_info.agent_key, AgentServiceState.CALLING.code)
     def call_other(self, call: CallInfo, device: DeviceInfo):
         call_id = call.call_id
         device_id = device.device_id

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

@@ -17,16 +17,17 @@ class ChannelBridgeHandler(EslEventHandler):
         self.push_handler = PushHandler(inbound_client.logger)
 
     def handle(self, address, event, coreUUID):
-        call_id = EslEventUtil.getCallId(event)
-        device_id = EslEventUtil.getDeviceId(event)
-        call = self.cache.get_call_info(call_id)
-        device = call.device_info_map.get(device_id)
-        # 每通电话的第一次写入应答时间
-        if not call.answer_time:
-            call.answer_time = EslEventUtil.getEventDateTimestamp(event)
-            self.cache.add_call_info(call)
-            self.dataHandleServer.update_record(call_id, {"status": 1})
-            self.logger.info("bridge call_info.answer_time:%s,device_info.answer_time%s,device.device_type%s" % (call.answer_time, device.answer_time,device.device_type))
-        if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
-            self.push_handler.push_on_agent_work_report(call.saas_id, call.cti_flow_id, call.agent_key, call.call_id, AgentScene.ROBOT, WorkStatus.AGENT_ANSWER_INCOMING)
-            self.dataHandleServer.update_agent_monitor_service_state(call.agent_key, AgentServiceState.CALLING.code)
+        pass
+        # call_id = EslEventUtil.getCallId(event)
+        # device_id = EslEventUtil.getDeviceId(event)
+        # call = self.cache.get_call_info(call_id)
+        # device = call.device_info_map.get(device_id)
+        # # 每通电话的第一次写入应答时间
+        # if not call.answer_time:
+        #     call.answer_time = EslEventUtil.getEventDateTimestamp(event)
+        #     self.cache.add_call_info(call)
+        #     self.dataHandleServer.update_record(call_id, {"status": 1})
+        #     self.logger.info("bridge call_info.answer_time:%s,device_info.answer_time%s,device.device_type%s" % (call.answer_time, device.answer_time,device.device_type))
+        # if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
+        #     self.push_handler.push_on_agent_work_report(call.saas_id, call.cti_flow_id, call.agent_key, call.call_id, AgentScene.ROBOT, WorkStatus.AGENT_ANSWER_INCOMING)
+        #     self.dataHandleServer.update_agent_monitor_service_state(call.agent_key, AgentServiceState.CALLING.code)

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

@@ -114,17 +114,16 @@ class ChannelHangupHandler(EslEventHandler):
                     call_info.end_time = timestamp
                     call_info.talk_time = int(call_info.end_time) - int(call_info.answer_time)
                     self.dataHandleServer.update_record(call_id, {"time_end": datetime.utcnow(), "times": int(call_info.talk_time / 1_000_000) })
+                # 更新坐席状态
+                if device_info.device_type == DeviceType.AGENT.code:
+                    self.push_handler.push_on_call_end(call_info.cti_flow_id, call_info.agent_key, AgentScene.ROBOT, call_info.direction, device_info.device_type)
+                    self.push_handler.push_on_agent_work_report(call_info.saas_id, call_info.cti_flow_id, call_info.agent_key, call_info.call_id, AgentScene.ROBOT, WorkStatus.AGENT_HANG_IDLE)
+                    self.dataHandleServer.update_agent_monitor_service_state(call_info.agent_key, AgentServiceState.IDLE.code)
 
             # 判断挂机方向 && 更新缓存
             self.hangup_dir(call_info, device_info, cause)
             self.cache.add_call_info(call_info)
 
-
-            # 更新坐席状态
-            if device_info.device_type == DeviceType.AGENT.code:
-                  self.push_handler.push_on_call_end(call_info.cti_flow_id, call_info.agent_key, AgentScene.ROBOT, call_info.direction, device_info.device_type)
-                  self.push_handler.push_on_agent_work_report(call_info.saas_id, call_info.cti_flow_id, call_info.agent_key,call_info.call_id, AgentScene.ROBOT,WorkStatus.AGENT_HANG_IDLE)
-                  self.dataHandleServer.update_agent_monitor_service_state(call_info.agent_key, AgentServiceState.IDLE.code)
         except:
             traceback.print_exc()
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # encoding:utf-8
 from src.core.callcenter.esl.annotation import EslEventName
-from src.core.callcenter.enumeration import  DeviceType,AgentScene,WorkStatus
+from src.core.callcenter.enumeration import  DeviceType,AgentScene,WorkStatus,Direction
 from src.core.callcenter.esl.constant.event_names import CHANNEL_ORIGINATE
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
 import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
@@ -20,5 +20,6 @@ class ChannelOriginateHandler(EslEventHandler):
         call = self.cache.get_call_info(call_id)
         device = call.device_info_map.get(device_id)
         self.logger.info('ChannelOriginateHandler::event %s, device.device_type: %s, DeviceType.AGENT.code:%s ', event,device.device_type, DeviceType.AGENT.code)
-        if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
+        if call.direction== Direction.INBOUND.code and device.device_type == DeviceType.AGENT.code: # 如果是呼入有响铃
+            self.push_handler.push_on_call_ring(call.cti_flow_id,call.agent_key,AgentScene.ROBOT,call.call_id,call.caller, call.called,"00000000000000000")
             self.push_handler.push_on_agent_work_report(call.saas_id, call.cti_flow_id,call.agent_key,call.call_id,AgentScene.ROBOT, WorkStatus.AGENT_RINGING,phone=call.caller)

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

@@ -2,15 +2,24 @@
 # encoding:utf-8
 
 from src.core.callcenter.esl.annotation import EslEventName
+from src.core.callcenter.enumeration import  DeviceType,AgentScene,WorkStatus
 from src.core.callcenter.esl.constant.event_names import CHANNEL_PROGRESS_MEDIA
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
-
+import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
+from src.core.callcenter.push import PushHandler
 
 @EslEventName(CHANNEL_PROGRESS_MEDIA)
 class ChannelProgressMediaHandler(EslEventHandler):
 
     def __init__(self, inbound_client, bot_agent):
         super().__init__(inbound_client, bot_agent)
+        self.push_handler = PushHandler(inbound_client.logger)
 
     def handle(self, address, event, coreUUID):
-        pass
+        call_id = EslEventUtil.getCallId(event)
+        device_id = EslEventUtil.getDeviceId(event)
+        call_info = self.cache.get_call_info(call_id)
+        device = call_info.device_info_map.get(device_id)
+        self.logger.info('ChannelProgressMediaHandler:: device.device_type: %s,  call_info.direction: %s ',device.device_type, call_info.direction)
+        if device.device_type == DeviceType.AGENT.code:
+            self.push_handler.push_on_agent_work_report(call_info.saas_id, call_info.cti_flow_id, call_info.agent_key, call_info.call_id, AgentScene.MANUAL, WorkStatus.AGENT_CALLING_RINGING)

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

@@ -3,15 +3,23 @@
 # encoding:utf-8
 
 from src.core.callcenter.esl.annotation import EslEventName
+from src.core.callcenter.enumeration import  DeviceType,AgentScene
 from src.core.callcenter.esl.constant.event_names import DETECTED_TONE
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
-
+import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
+from src.core.callcenter.push import PushHandler
 
 @EslEventName(DETECTED_TONE)
 class DetectedToneHandler(EslEventHandler):
 
     def __init__(self, inbound_client, bot_agent):
         super().__init__(inbound_client, bot_agent)
+        self.push_handler = PushHandler(inbound_client.logger)
 
     def handle(self, address, event, coreUUID):
-        pass
+        call_id = EslEventUtil.getCallId(event)
+        device_id = EslEventUtil.getDeviceId(event)
+        call = self.cache.get_call_info(call_id)
+        device = call.device_info_map.get(device_id)
+        if call.answer_time and device.device_type == DeviceType.AGENT.code:
+            self.push_handler.push_on_detected_tone(call.cti_flow_id, call.agent_key, AgentScene.MANUAL,call.call_id)

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

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+# encoding:utf-8
+from src.core.callcenter.esl.annotation import EslEventName
+from src.core.callcenter.enumeration import  DeviceType,AgentScene
+from src.core.callcenter.esl.constant.event_names import PLAYBACK_START
+from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
+import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
+from src.core.callcenter.push import PushHandler
+from src.core.callcenter.data_handler import *
+
+@EslEventName(PLAYBACK_START)
+class PlaybackStartHandler(EslEventHandler):
+
+    def __init__(self, inbound_client, bot_agent):
+        super().__init__(inbound_client, bot_agent)
+        self.dataHandleServer = DataHandleServer(inbound_client.app)
+        self.push_handler = PushHandler(inbound_client.logger)
+
+    def handle(self, address, event, coreUUID):
+        call_id = EslEventUtil.getCallId(event)
+        device_id = EslEventUtil.getDeviceId(event)
+        call = self.cache.get_call_info(call_id)
+        device = call.device_info_map.get(device_id)
+        if device.device_type == DeviceType.AGENT.code:
+            self.push_handler.push_on_ring_start(call.cti_flow_id, call.agent_key, AgentScene.MANUAL, call.call_id)

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

@@ -2,15 +2,25 @@
 # encoding:utf-8
 
 from src.core.callcenter.esl.annotation import EslEventName
+from src.core.callcenter.enumeration import  DeviceType,AgentScene
 from src.core.callcenter.esl.constant.event_names import PLAYBACK_STOP
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
-
+import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
+from src.core.callcenter.push import PushHandler
+from src.core.callcenter.data_handler import *
 
 @EslEventName(PLAYBACK_STOP)
 class PlaybackStopHandler(EslEventHandler):
 
     def __init__(self, inbound_client, bot_agent):
         super().__init__(inbound_client, bot_agent)
+        self.dataHandleServer = DataHandleServer(inbound_client.app)
+        self.push_handler = PushHandler(inbound_client.logger)
 
     def handle(self, address, event, coreUUID):
-        pass
+        call_id = EslEventUtil.getCallId(event)
+        device_id = EslEventUtil.getDeviceId(event)
+        call = self.cache.get_call_info(call_id)
+        device = call.device_info_map.get(device_id)
+        if device.device_type == DeviceType.AGENT.code:
+            self.push_handler.push_on_ring_end(call.cti_flow_id, call.agent_key, AgentScene.MANUAL,call.call_id)

src/core/callcenter/push.py

@@ -49,7 +49,7 @@ class PushHandler:
         new_data = {'data': json.dumps(data)}
         self.push_to_socket_service(user_id, json.dumps(new_data))
 
-    def push_on_call_ring(self, saas_id, flow_id, user_id,scene:AgentScene, call_id,  calling_no, called_no, human_service_id):
+    def push_on_call_ring(self, flow_id, user_id,scene:AgentScene, call_id,  calling_no, called_no, human_service_id):
         data = {
             'eventName': DownEvent.ON_CALLRING.code,
             'ext': {
@@ -79,7 +79,7 @@ class PushHandler:
         new_data = {'data': json.dumps(data)}
         self.push_to_socket_service(user_id, json.dumps(new_data))
 
-    def push_on_ring_start(self, saas_id, flow_id, user_id, scene: AgentScene, call_id=None):
+    def push_on_ring_start(self, flow_id, user_id, scene: AgentScene, call_id=None):
         data = {
             'eventName': DownEvent.ON_RING_Start.code,
             'ext': {
@@ -92,7 +92,7 @@ class PushHandler:
         new_data = {'data': json.dumps(data)}
         self.push_to_socket_service(user_id, json.dumps(new_data))
 
-    def push_on_ring_end(self, saas_id, flow_id, user_id, scene: AgentScene, call_id):
+    def push_on_ring_end(self, flow_id, user_id, scene: AgentScene, call_id):
         data = {
             'eventName': DownEvent.ON_RING_END.code,
             'ext': {
@@ -118,4 +118,17 @@ class PushHandler:
         }
         self.logger.info("flowId:[%s] push_on_ring_end push:[%s].", flow_id, json.dumps(data))
         new_data = {'data': json.dumps(data)}
+        self.push_to_socket_service(user_id, json.dumps(new_data))
+
+    def push_on_detected_tone(self, flow_id, user_id, scene: AgentScene, call_id, ):
+        data = {
+            'eventName': DownEvent.ON_DETECTED_TONE.code,
+            'ext': {
+                'ctiFlowId': flow_id,
+                'scene': scene.code,
+                'callId': call_id,
+            }
+        }
+        self.logger.info("flowId:[%s] push_on_ring_end push:[%s].", flow_id, json.dumps(data))
+        new_data = {'data': json.dumps(data)}
         self.push_to_socket_service(user_id, json.dumps(new_data))