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

src/core/callcenter/agent.py

@@ -120,7 +120,7 @@ class AgentEventService:
                         return
 
                 self.agent_state_service.busy(saas_id, agent.agent_num, agent.phone_num)
-                self.data_handle_server.update_record(call_id, status=1)
+                self.data_handle_server.update_record(call_id, status=1, user_id=agent.user_id,user_name=agent.agent_name)
                 if is_agent:
                     # 坐席接起
                     self.cache.set_call_is_answer(saas_id, flow_id)
@@ -203,6 +203,7 @@ class AgentEventService:
 
             if CHANNEL_ANSWER == event_name:
                 self.agent_state_service.busy(saas_id, agent.agent_num, agent.phone_num)
+                self.data_handle_server.update_record(call_id, status=1)
                 if is_agent:
                     self.agent_monitor_service.update_calling(agent_monitor)
                     self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.ROBOT, WorkStatus.AGENT_ANSWER_INCOMING, "座席接通呼入电话! internal")

src/core/callcenter/data_handler.py

@@ -17,23 +17,16 @@ class DataHandleServer:
             "phone": caller_number,
             "type": call_type,
             "service_category": service_category,
-            # "agent_num":destination,
             "user_id":destination,
             "user_name": f"机器人{destination}" if destination else None,
         }
         call_record = CallRecord()
+        self.app.logger.info(f"创建通话记录: {call_info}")
         # 处理多余的参数
         for key, value in call_info.items():
             if hasattr(call_record, key):  # 确保模型有这个属性
                 setattr(call_record, key, value)
         try:
-            if call_type in [0, 2] or category == 1:  # 如果呼入类型是白名单和传统服务或者是呼出修改坐席id和坐席名称
-                if destination:  # 确保 agent_num 存在
-                    agent = self.get_user_name(destination)
-                    call_record.user_id = agent.user_id
-                    call_record.user_name = agent.agent_name
-            else:  # 如果是机器人，则修改状态为已接通
-                call_record.status = 1
             db.session.add(call_record)
             db.session.commit()
             print("记录创建成功")