fix:bug

src/core/callcenter/agent.py

@@ -143,7 +143,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.utcnow())
+            self.data_handle_server.update_record(call_id, time_end=datetime.now())
             # 同步处理后处理置闲
             # reprocessingIdle(statusDto);
             # agentProducer.pushDelayedStatus(statusDto, reprocessingTimeout);
@@ -213,7 +213,7 @@ 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.utcnow())
+            self.data_handle_server.update_record(call_id, time_end=datetime.now())
 
 
     def reprocessing_idle(self, state_data: AgentDelayStateData):
@@ -591,31 +591,31 @@ class AgentMonitorService:
     @with_app_context
     def update_checkin(self, agent_monitor):
         agent_monitor.check_state = AgentCheck.IN.code
-        agent_monitor.check_in_time = datetime.utcnow()
+        agent_monitor.check_in_time = datetime.now()
         agent_monitor.heart_state = AgentHeartState.NORMAL.code
-        agent_monitor.heart_time = datetime.utcnow()
+        agent_monitor.heart_time = datetime.now()
         db.session.commit()
 
     @with_app_context
     def update_checkout(self, agent_monitor):
         agent_monitor.check_state = AgentCheck.OUT.code
-        agent_monitor.check_out_time = datetime.utcnow()
+        agent_monitor.check_out_time = datetime.now()
         agent_monitor.service_state = AgentServiceState.LOGOUT.code
         agent_monitor.heart_state = AgentHeartState.DEFAULT.code
-        agent_monitor.heart_time = datetime.utcnow()
+        agent_monitor.heart_time = datetime.now()
         self.logger.info("update_checkout %s", agent_monitor.check_out_time)
         db.session.commit()
 
     @with_app_context
     def update_idle(self, agent_monitor):
         agent_monitor.service_state = AgentServiceState.IDLE.code
-        agent_monitor.idle_time = datetime.utcnow()
+        agent_monitor.idle_time = datetime.now()
         db.session.commit()
 
     @with_app_context
     def update_busy(self, agent_monitor):
         agent_monitor.service_state = AgentServiceState.BUSY.code
-        agent_monitor.busy_time = datetime.utcnow()
+        agent_monitor.busy_time = datetime.now()
         db.session.commit()
 
     @with_app_context
@@ -626,13 +626,13 @@ class AgentMonitorService:
     @with_app_context
     def update_calling(self, agent_monitor):
         agent_monitor.service_state = AgentServiceState.CALLING.code
-        agent_monitor.call_time = datetime.utcnow()
+        agent_monitor.call_time = datetime.now()
         db.session.commit()
 
     @with_app_context
     def update_processing(self, agent_monitor):
         agent_monitor.service_state = AgentServiceState.REPROCESSING.code
-        agent_monitor.hang_time = datetime.utcnow()
+        agent_monitor.hang_time = datetime.now()
         db.session.commit()
 
     @with_app_context
@@ -643,7 +643,7 @@ class AgentMonitorService:
     @with_app_context
     def update_heart_error(self, agent_monitor):
         agent_monitor.heart_state = AgentHeartState.ABNORMAL.code
-        agent_monitor.heart_time = datetime.utcnow()
+        agent_monitor.heart_time = datetime.now()
         db.session.commit()
 
     def _get_day_start(self):
@@ -670,7 +670,7 @@ class AgentActionLogService:
         if agent_log_enum:
             action_log.event_type = agent_log_enum.code
             action_log.event_desc = agent_log_enum.description
-        now = datetime.utcnow()
+        now = datetime.now()
         pre_date = None
         if agent_monitor.check_state == AgentCheck.IN.code:
             pre_date = agent_monitor.check_in_time
@@ -702,7 +702,7 @@ class AgentActionLogService:
         if agent_log_enum:
             action_log.event_type = agent_log_enum.code
             action_log.event_desc = agent_log_enum.description
-        now = datetime.utcnow()
+        now = datetime.now()
         pre_date = None
         if agent_monitor.service_state == AgentServiceState.IDLE.code:
             pre_date = agent_monitor.idle_time
@@ -779,7 +779,7 @@ class AgentStateService:
         key = self._check_in_key(saas_id)
         state_data = AgentStateData()
         state_data.status = HumanState.DEFAULT.code
-        state_data.time = datetime.utcnow().timestamp()
+        state_data.time = datetime.now().timestamp()
         self.redis_handler.redis.hset(key, phone_num, state_data.to_json_string())
         self.redis_handler.redis.expire(key, self._get_expire_time())
 
@@ -802,7 +802,7 @@ class AgentStateService:
         cache_agent_map = self.get_cache_agent_map(saas_id, service_id)
         if cache_agent_map and choose_phone_num in cache_agent_map:
             state_data = cache_agent_map[choose_phone_num]
-            state_data.assign_time = datetime.utcnow().timestamp() * 1000
+            state_data.assign_time = datetime.now().timestamp() * 1000
             self.redis_handler.redis.hset(key, choose_phone_num, state_data.to_json_string())
             self.redis_handler.redis.expire(key, self._get_expire_time())
             # self.update_report_state(saas_id, service_id)
@@ -825,7 +825,7 @@ class AgentStateService:
             state_data = cache_agent_map[phone_num]
 
         state_data.status = HumanState.IDLE.code
-        state_data.time = datetime.utcnow().timestamp() * 1000
+        state_data.time = datetime.now().timestamp() * 1000
         self.redis_handler.redis.hset(key, phone_num, state_data.to_json_string())
         self.redis_handler.redis.expire(key, self._get_expire_time())
         # self.update_report_state(saas_id, service_id)
@@ -866,7 +866,7 @@ class AgentStateService:
         return free_agents
 
     def get_idle_agents(self,cache_agent_list):
-        current_time =int(datetime.utcnow().timestamp() * 1000)  # 获取当前时间的毫秒级时间戳
+        current_time =int(datetime.now().timestamp() * 1000)  # 获取当前时间的毫秒级时间戳
         idle_agents = [
             agent for agent in cache_agent_list
             if agent.status == 1 and (

src/core/callcenter/cache.py

@@ -123,12 +123,12 @@ class Cache:
         delay_action.uuid = str(uuid.uuid4())
         key = CTI_ENGINE_DELAY_ACTION % action
         msg = delay_action.to_json_string()
-        action_time = datetime.utcnow().timestamp()*1000 + timeouts * 1000
+        action_time = datetime.now().timestamp()*1000 + timeouts * 1000
         self.redis_handler.redis.zadd(key, {msg : action_time})
 
     def get_delay_message(self, action):
         key = CTI_ENGINE_DELAY_ACTION % action
-        current_time = int(datetime.utcnow().timestamp() * 1000)  # 毫秒级时间戳
+        current_time = int(datetime.now().timestamp() * 1000)  # 毫秒级时间戳
         members = self.redis_handler.redis.zrangebyscore(key, 0, current_time, start=0, num=DELAY_ACTION_BATCH_SIZE, withscores=True)
         if not members:
             return []

src/core/callcenter/call.py

@@ -33,7 +33,7 @@ class CallService:
         call_id = 'C' + str(self.snowflake.next_id())
         device_id = 'D' + str(self.snowflake.next_id())
         # now = lambda: int(round(time.time() * 1000))
-        now = datetime.utcnow().timestamp()
+        now = datetime.now().timestamp()
         self.logger.info("CallService 人工外呼 agent:%s makecall, ctiFlowId:%s, callId:%s, callerDisplay:%s, called:%s"%
               (request.caller, request.cti_flow_id, call_id, request.caller_display, request.called))
 
@@ -65,7 +65,7 @@ class CallService:
         # # 创建一条通话记录
         # self.dataHandleServer.create_record({
         #     "session_id": call_id,
-        #     "time_begin": datetime.utcnow(),
+        #     "time_begin": datetime.now(),
         #     "category": 1,
         #     "agent_num":request.agent_id,
         #     "phone": request.called
@@ -103,7 +103,7 @@ class CallService:
         agent = self.cache.get_agent_info(call_info.saas_id, agent_number)
         device_id = 'T' + str(self.snowflake.next_id())
         # now = lambda: int(round(time.time() * 1000))
-        now = datetime.utcnow().timestamp()
+        now = datetime.now().timestamp()
 
         device_info = DeviceInfo(device_id=device_id, caller=caller, display=caller, called=agent_number, call_id=call_id,
                             call_time=now, cdr_type=CdrType.TRANSFER.code, device_type=DeviceType.AGENT.code,

src/core/callcenter/data_handler.py

@@ -12,7 +12,7 @@ class DataHandleServer:
     def create_record(self, call_id, caller_number, call_type, service_category=None, destination=None, category=0):
         call_info = {
             "session_id": call_id,
-            "time_begin": datetime.utcnow(),
+            "time_begin": datetime.now(),
             "category": category,
             "phone": caller_number,
             "type": call_type,

src/core/callcenter/esl/client.py

@@ -603,7 +603,7 @@ class OutboundClient:
         def build_call_info(self, call_id, device_id, new_device_id, destination, bucket_type, **kwargs):
             caller = kwargs.get('Channel-Caller-ID-Number')
             called = destination
-            now = datetime.utcnow().timestamp()
+            now = datetime.now().timestamp()
 
             call_info = CallInfo(call_id=call_id, agent_key=destination,
                                  caller=caller, called=called, direction=Direction.INBOUND.code,

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

@@ -91,7 +91,7 @@ class ChannelAnswerHandler(EslEventHandler):
         self.logger.info("呼另外一侧电话: callId: %s, display:%s, called:%s, deviceId: %s "%(call_id, call.called_display, called, device_id))
 
         # now = lambda: int(round(time.time() * 1000))
-        now = datetime.utcnow().timestamp()
+        now = datetime.now().timestamp()
         route_gateway = self.cache.get_route_gateway(call.saas_id)
         agent = self.cache.get_agent_info(call.saas_id, call.agent_key)
         new_device = DeviceInfo(device_id=new_device_id, call_id=call_id, agent_key=call.agent_key,

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

@@ -115,7 +115,7 @@ class ChannelHangupHandler(EslEventHandler):
             #     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.utcnow(), "times": int(call_info.talk_time / 1_000_000) })
+            #         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)
             #     # 更新坐席状态

src/core/callcenter/push.py

@@ -44,7 +44,7 @@ class PushHandler:
                 'scene': scene.code,
                 '_shortagentid': user_id,
                 '_astate': service_state.code,
-                '_atime': datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+                '_atime': datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             }
         }
         self.logger.info("OnAgentReport event triger:", json.dumps(data))