fix: bug

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

@@ -38,8 +38,8 @@ class ChannelAnswerHandler(EslEventHandler):
         if not next_command:
             return
         print("device_info.device_type:%s,DeviceType.CUSTOMER.code%s"%(device_info.device_type, DeviceType.CUSTOMER.code))
-        if device_info.device_type == DeviceType.AGENT.code:
-            self.push_handler.push_on_ring_start(saas_id=call_info.saas_id, flow_id=call_info.cti_flow_id, user_id=call_info.agent_key, scene=AgentScene.MANUAL, call_id=call_info.call_id)
+        # if device_info.device_type == DeviceType.CUSTOMER.code:
+        #     self.push_handler.push_on_ring_start(saas_id=call_info.saas_id, flow_id=call_info.cti_flow_id, user_id=call_info.agent_key, scene=AgentScene.MANUAL, call_id=call_info.call_id)
 
         if not call_info.answer_time:
             call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)

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

@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 # encoding:utf-8
 from src.core.callcenter.esl.annotation import EslEventName
-from src.core.callcenter.enumeration import  DeviceType, AgentServiceState
+from src.core.callcenter.enumeration import  DeviceType, AgentServiceState,WorkStatus,AgentScene
 from src.core.callcenter.esl.constant.event_names import CHANNEL_BRIDGE
 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(CHANNEL_BRIDGE)
@@ -13,6 +14,7 @@ class ChannelBridgeHandler(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)
@@ -25,7 +27,9 @@ class ChannelBridgeHandler(EslEventHandler):
         print('debugger::device_id is23232323232 ', device_id, device, flush=True)
         print("bridge call_info.answer_time:%s,device_info.answer_time%s,device.device_type%s" % (call.answer_time, device.answer_time,device.device_type),
               flush=True)
+        self.cache.add_call_info(call)
         if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
             print("变更坐席状态:%s" % call.agent_key)
-            self.dataHandleServer.update_agent_monitor_service_state(call.agent_key, AgentServiceState.IDLE.code)
+            self.dataHandleServer.update_agent_monitor_service_state(call.agent_key, AgentServiceState.CALLING.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)
         pass

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

@@ -8,12 +8,13 @@ import traceback
 from src.core.callcenter.acd import AcdService
 from src.core.callcenter.call import CallService
 from src.core.callcenter.enumeration import CallType, DeviceType, AnswerFlag, NextType, CdrType, HangupDir, \
-    CallCause,AgentServiceState
+    CallCause,AgentServiceState, AgentScene
 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_HANGUP
 from src.core.callcenter.esl.handler.esl_event_handler import EslEventHandler
 from src.core.callcenter.api import CallInfo, DeviceInfo, NextCommand
+from src.core.callcenter.push import PushHandler
 from src.core.callcenter.data_handler import *
 
 @EslEventName(CHANNEL_HANGUP)
@@ -23,6 +24,7 @@ class ChannelHangupHandler(EslEventHandler):
         super().__init__(inbound_client, bot_agent)
         self.acd_service = AcdService(inbound_client,inbound_client.app)
         self.call_service = CallService(inbound_client,inbound_client.logger)
+        self.push_handler = PushHandler(inbound_client.logger)
         self.dataHandleServer=DataHandleServer(inbound_client.app)
 
     def handle(self, address, event, coreUUID):
@@ -111,6 +113,7 @@ class ChannelHangupHandler(EslEventHandler):
 
             if len(call.device_list)==0 and device.device_type == DeviceType.AGENT.code:
                 self.dataHandleServer.update_agent_monitor_service_state(device_id, AgentServiceState.IDLE.code)
+                self.push_handler.push_on_call_end(saas_id=call.saas_id, flow_id=call.cti_flow_id, user_id=call.agent_key)
         except:
             traceback.print_exc()
 

src/core/callcenter/push.py

@@ -66,14 +66,11 @@ class PushHandler:
         new_data = {'data': json.dumps(data)}
         self.push_to_socket_service(user_id, json.dumps(new_data))
 
-    def push_on_call_end(self, saas_id, flow_id, user_id,  scene: AgentScene, service_direct=None, disconnect_type=0):
+    def push_on_call_end(self, saas_id, flow_id, user_id):
         data = {
             'eventName': DownEvent.ON_CALL_END.code,
             'ext': {
-                'ctiFlowId': flow_id,
-                'scene': scene.code,
-                'disconnectType': disconnect_type,
-                'serviceDirect': service_direct
+                'ctiFlowId': flow_id
             }
         }
         self.logger.info("flowId:[%s] OnAgentWorkReport push:[%s].", flow_id, json.dumps(data))