Merge branch 'dev_transfer_20241123' of ssh://gitlab.fuxicarbon.com:1111/client_service/voice-gateway-service into dev_transfer_20241123

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# encoding:utf-8
+from src.core.callcenter.esl.annotation import EslEventName
+from src.core.callcenter.enumeration import  DeviceType, AgentServiceState,AgentScene,WorkStatus
+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
+
+@EslEventName(CHANNEL_BRIDGE)
+class ChannelOriginateHandler(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):
+        # 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)
+        # self.logger.info('ChannelOriginateHandler::device_id: %s, device:%s ', device_id, device)
+        # if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
+        #     self.push_handler.push_on_call_ring(call.saas_id,call.cti_flow_id,call.agent_key,AgentScene.ROBOT,call.call_id, call.called,call.caller, "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)
+
+        pass

src/core/callcenter/push.py

@@ -18,7 +18,7 @@ class PushHandler:
         # 获取 RedisHandler 实例并发布消息到 Redis 频道
         redis_handler = RedisHandler()
         redis_handler.publish('socket_channel', message)
-    def push_on_agent_work_report(self, saas_id, flow_id, user_id, call_id, scene: AgentScene, work_status: WorkStatus, description=""):
+    def push_on_agent_work_report(self, saas_id, flow_id, user_id, call_id, scene: AgentScene, work_status: WorkStatus, description=None):
         data = {
             'eventName': DownEvent.ON_AGENT_WORK_REPORT.code,
             'ext': {'workStatus': work_status.code,
@@ -48,15 +48,13 @@ 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, call_id, file_name, calling_no, called_no, human_service_id):
+    def push_on_call_ring(self, saas_id, flow_id, user_id,scene:AgentScene, call_id,  calling_no, called_no, human_service_id):
         data = {
             'eventName': DownEvent.ON_CALLRING.code,
             'ext': {
                 'callId':call_id,
                 'ctiFlowId':flow_id,
                 'scene': scene.code,
-                'fileName': file_name,
-                'serviceDirect':'',
                 'callingNo': calling_no,
                 'calledNo': called_no,
                 'serviceTaskId': human_service_id