fix(event-time): event_end_time/frame_timestamp NOT NULL 列兜底

- Edge push 模式: event_end_time 未提供时用 start+视频时长推算
- fam-core db_layer: insert_event 空值兜底(end→start→NOW)
- insert_event_detail: frame_timestamp 空值兜底 NOW
解决 1048 Column cannot be null 落库失败
This commit is contained in:
ericwyuan
2026-08-20 02:20:01 +08:00
parent e7fb0c92bc
commit 6a9d1626fb
2 changed files with 29 additions and 3 deletions

View File

@@ -187,12 +187,21 @@ def insert_event(task_id: int, event_start_time: str, event_end_time: str,
conn = get_conn() conn = get_conn()
try: try:
cursor = conn.cursor() cursor = conn.cursor()
# event_start/end_time 为 NOT NULL 列: 空值兜底
# end 缺失 → 用 startstart 也缺失 → 用当前时间
dt_start = _dt_or_none(event_start_time)
dt_end = _dt_or_none(event_end_time)
if not dt_end:
dt_end = dt_start
if not dt_start:
from datetime import datetime as _dt
dt_start = dt_end = _dt.now().strftime('%Y-%m-%d %H:%M:%S')
cursor.execute( cursor.execute(
"""INSERT INTO monitor_events """INSERT INTO monitor_events
(task_id, event_start_time, event_end_time, camera_name, (task_id, event_start_time, event_end_time, camera_name,
global_summary, entities_json, compute_provider) global_summary, entities_json, compute_provider)
VALUES (%s, %s, %s, %s, %s, %s, %s)""", VALUES (%s, %s, %s, %s, %s, %s, %s)""",
(task_id, _dt_or_none(event_start_time), _dt_or_none(event_end_time), camera_name, (task_id, dt_start, dt_end, camera_name,
global_summary, json.dumps(entities_json, ensure_ascii=False), global_summary, json.dumps(entities_json, ensure_ascii=False),
json.dumps(compute_provider, ensure_ascii=False)) json.dumps(compute_provider, ensure_ascii=False))
) )
@@ -214,12 +223,17 @@ def insert_event_detail(event_id: int, task_id: int, frame_index: int,
conn = get_conn() conn = get_conn()
try: try:
cursor = conn.cursor() cursor = conn.cursor()
# frame_timestamp 为 NOT NULL 列: 空值兜底为当前时间
dt_ts = _dt_or_none(frame_timestamp)
if not dt_ts:
from datetime import datetime as _dt
dt_ts = _dt.now().strftime('%Y-%m-%d %H:%M:%S')
cursor.execute( cursor.execute(
"""INSERT INTO event_details """INSERT INTO event_details
(event_id, task_id, frame_index, frame_timestamp, camera_name, (event_id, task_id, frame_index, frame_timestamp, camera_name,
person, action, clothing, is_attention_event, source_providers) person, action, clothing, is_attention_event, source_providers)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""", VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""",
(event_id, task_id, frame_index, _dt_or_none(frame_timestamp), camera_name, (event_id, task_id, frame_index, dt_ts, camera_name,
person, action, clothing, is_attention_event, person, action, clothing, is_attention_event,
json.dumps(source_providers, ensure_ascii=False)) json.dumps(source_providers, ensure_ascii=False))
) )

View File

@@ -14,6 +14,7 @@ import time
import json import json
import base64 import base64
import requests import requests
from datetime import datetime, timedelta
from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError as FuturesTimeout from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError as FuturesTimeout
from typing import Dict, List, Optional from typing import Dict, List, Optional
@@ -366,6 +367,17 @@ class AIOrchestrator:
video_path, len(compressed_frames), event_start_time video_path, len(compressed_frames), event_start_time
) )
# event_end_time 未提供时,用 start + 视频时长推算DB 列 NOT NULL
event_end_time = task_data.get('event_end_time', '')
if not event_end_time and event_start_time and preprocessor.video_duration > 0:
try:
start_dt = datetime.strptime(event_start_time, '%Y-%m-%d %H:%M:%S')
event_end_time = (
start_dt + timedelta(seconds=int(preprocessor.video_duration))
).strftime('%Y-%m-%d %H:%M:%S')
except ValueError:
pass
# 3. 并行视觉分析 # 3. 并行视觉分析
model_outputs = self.run_visual_analysis( model_outputs = self.run_visual_analysis(
healthy_adapters, compressed_frames, frame_timestamps, known_members healthy_adapters, compressed_frames, frame_timestamps, known_members
@@ -383,7 +395,7 @@ class AIOrchestrator:
"task_id": task_id, "task_id": task_id,
"status": "success", "status": "success",
"event_start_time": event_start_time, "event_start_time": event_start_time,
"event_end_time": task_data.get('event_end_time', ''), "event_end_time": event_end_time,
"camera_name": task_data.get('camera_name', ''), "camera_name": task_data.get('camera_name', ''),
"global_summary": fusion_result.get('global_summary', ''), "global_summary": fusion_result.get('global_summary', ''),
"entities_json": fusion_result.get('entities_json', []), "entities_json": fusion_result.get('entities_json', []),