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

src/core/callcenter/agent.py

@@ -149,6 +149,7 @@ class AgentEventService:
                 self.agent_actionlog_service.insert_service_state(agent_monitor, AgentServiceState.REPROCESSING, AgentLogState.CHANNEL_HANG_UP)
 
                 self.data_handle_server.update_record(call_id, time_end=datetime.now())
+
                 # 同步处理后处理置闲
                 # reprocessingIdle(statusDto);
                 # agentProducer.pushDelayedStatus(statusDto, reprocessingTimeout);
@@ -222,6 +223,8 @@ class AgentEventService:
                 self.agent_actionlog_service.insert_service_state(agent_monitor, AgentServiceState.REPROCESSING,
                                                       AgentLogState.CHANNEL_HANG_UP, service_id=human_service_id)
                 self.data_handle_server.update_record(call_id, time_end=datetime.now())
+
+
         except:
             traceback.print_exc()
         finally:
@@ -240,6 +243,9 @@ class AgentEventService:
         self.agent_actionlog_service.insert_service_state(agent_monitor, AgentServiceState.IDLE, AgentLogState.REPROCESSING_IDLE)
 
 
+
+
+
 class AgentOperService:
 
     def __init__(self, app):

src/core/callcenter/data_handler.py

@@ -45,9 +45,9 @@ class DataHandleServer:
     def update_record(self, session_id, **kwargs):
         call_record = CallRecord.query.filter(CallRecord.session_id == session_id).first()
         time_end = kwargs.get('time_end')
-        if time_end:
+        if time_end and call_record.type==1:
             bot_record = BotRecords.query.filter(BotRecords.session == session_id).first()
-            call_record.bussiness_type = bot_record.intent
+            call_record.bussiness_type = bot_record.intent if bot_record else ''
         # 动态更新字段
         for key, value in kwargs.items():
             if hasattr(call_record, key):

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

@@ -78,7 +78,7 @@ class ChannelAnswerHandler(EslEventHandler):
         # 启用录音, 生产时候打开
         record_url = self.record(event, device_id)
         device.record_start_time = device.answer_time
-        self.dataHandleServer.update_record(call_id, url= record_url)
+        # self.dataHandleServer.update_record(call_id, url= record_url)
 
         call.direction = Direction.OUTBOUND.code
         call.answer_flag = AnswerFlag.AGENT_ANSWER.code

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

@@ -113,20 +113,8 @@ class ChannelHangupHandler(EslEventHandler):
 
             # 全部挂机以后推送挂机状态
             # self.logger.info('yushanghui::call_info.device_list %s', call_info.device_list)
-            # if len(call_info.device_list) == 0:
-            #     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)
-            #     # 计算当前通话时长
-            #     if call_info.answer_time:
-            #         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.now(), "times": int(call_info.talk_time / 1_000_000) })
-            #
-            #     self.logger.info('全部挂断 %s', device_info.device_type)
-            #     # 更新坐席状态
-            #     if device_info.device_type == DeviceType.AGENT.code:
-            #         self.logger.info('更新坐席状态')
-            #         self.dataHandleServer.update_agent_monitor_service_state(call_info.agent_key, AgentServiceState.IDLE.code)
+            if len(call_info.device_list) == 0:
+                self.get_call_info_record(call_info)
 
             # 判断挂机方向 && 更新缓存
             self.hangup_dir(call_info, device_info, cause)
@@ -135,6 +123,12 @@ class ChannelHangupHandler(EslEventHandler):
         except:
             traceback.print_exc()
 
+    def get_call_info_record(self, call_info):
+        records = []
+        self.logger.info("1223232 %s", records)
+        for value in call_info.device_info_map.values():
+            records.append(value.record)
+        self.logger.info("get_call_info_record: %s", records)
     def release(self, event):
         device_id = event.getHeader("Unique-ID")
         user_part = self.cache.get_user_part(device_id)