fix:bug

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

@@ -46,9 +46,15 @@ class ChannelAnswerHandler(EslEventHandler):
         device_info.ring_end_time = EslEventUtil.getEventDateTimestamp(event)
         call_info.answer_count = call_info.answer_count + 1
         call_info.next_commands.remove(next_command)
-        # self.logger.info("ysChannelAnswerHandler call_info.answer_time::%s,time:%s", call_info.answer_time, EslEventUtil.getEventDateTimestamp(event))
-        # if not call_info.answer_time:
-        #     call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)
+        self.logger.info("ysChannelAnswerHandler call_info.answer_time::%s,time:%s", call_info.answer_time, EslEventUtil.getEventDateTimestamp(event))
+
+        if (call_info.direction == Direction.OUTBOUND.code and device_info.device_type == DeviceType.CUSTOMER.code) or (call_info.direction == Direction.INBOUND.code and device_info.device_type == DeviceType.AGENT.code):  # 如果是坐席接听 变更坐席状态
+            self.logger.info('坐席接听')
+            call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)
+            self.dataHandleServer.update_record(call_id, {"status": 1})
+            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)
+            self.logger.info("坐席接听 event:%s" % (json.loads(event.serialize('json'))))
 
         if NextType.NEXT_CALL_OTHER.code == next_command.next_type:
             self.call_other(call_info, device_info, event)
@@ -62,13 +68,6 @@ 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.logger.info('坐席接听')
-        #     self.dataHandleServer.update_record(call_id, {"status": 1})
-        #     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)
-
-        self.logger.info("lwanswer call_id:%s, call_info:%s, event:%s" % (call_id, call_info, json.loads(event.serialize('json'))))
 
     def call_other(self, call: CallInfo, device: DeviceInfo, event):
         call_id = call.call_id

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

@@ -13,21 +13,22 @@ 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)
+        # 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_info = self.cache.get_call_info(call_id)
-        device = call_info.device_info_map.get(device_id)
-        # 每通电话的第一次写入应答时间
-        if not call_info.answer_time:
-            call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)
-            self.cache.add_call_info(call_info)
-            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_info.answer_time, device.answer_time,device.device_type))
-        if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
-            # self.dataHandleServer.update_record(call_id, {"status": 1})
-            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)
+        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)
+        # # 每通电话的第一次写入应答时间
+        # if not call_info.answer_time:
+        #     call_info.answer_time = EslEventUtil.getEventDateTimestamp(event)
+        #     self.cache.add_call_info(call_info)
+        #     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_info.answer_time, device.answer_time,device.device_type))
+        # if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
+        #     # self.dataHandleServer.update_record(call_id, {"status": 1})
+        #     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)

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

@@ -21,5 +21,5 @@ class ChannelProgressMediaHandler(EslEventHandler):
         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 call_info.direction == Direction.OUTBOUND.code and device.device_type == DeviceType.CUSTOMER.code:
+        if call_info.direction == Direction.OUTBOUND.code and 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)