yolo模型识别不到
This commit is contained in:
10
core/all.py
10
core/all.py
@ -67,7 +67,7 @@ def detect(client_ip, frame):
|
||||
if full_save_path:
|
||||
cv2.imwrite(full_save_path, frame)
|
||||
print(f"✅ yolo违规图片已保存:{display_path}") # 日志也修正
|
||||
save_db(model_type="yolo", client_ip=client_ip, result=str(full_save_path))
|
||||
save_db(model_type="yolo", client_ip=client_ip, result=str(display_path))
|
||||
return (True, yolo_result, "yolo")
|
||||
|
||||
# 2. 人脸检测
|
||||
@ -77,17 +77,19 @@ def detect(client_ip, frame):
|
||||
if full_save_path:
|
||||
cv2.imwrite(full_save_path, frame)
|
||||
print(f"✅ face违规图片已保存:{display_path}") # 日志也修正
|
||||
save_db(model_type="face", client_ip=client_ip, result=str(full_save_path))
|
||||
save_db(model_type="face", client_ip=client_ip, result=str(display_path))
|
||||
return (True, face_result, "face")
|
||||
|
||||
# 3. OCR检测
|
||||
ocr_flag, ocr_result = ocrDetect(frame)
|
||||
if ocr_flag:
|
||||
full_save_path, display_path = get_image_save_path(model_type="ocr", client_ip=client_ip) # 这里改了
|
||||
full_save_path, display_path = get_image_save_path(model_type="ocr", client_ip=client_ip)
|
||||
print(f"✅ ocr违规图片已保存:{display_path}")
|
||||
# 这里改了
|
||||
if full_save_path:
|
||||
cv2.imwrite(full_save_path, frame)
|
||||
print(f"✅ ocr违规图片已保存:{display_path}") # 日志也修正
|
||||
save_db(model_type="ocr", client_ip=client_ip, result=str(full_save_path))
|
||||
save_db(model_type="ocr", client_ip=client_ip, result=str(display_path))
|
||||
return (True, ocr_result, "ocr")
|
||||
|
||||
# 4. 无违规内容(不保存图片)
|
||||
|
||||
@ -1,30 +1,29 @@
|
||||
import datetime
|
||||
from pathlib import Path
|
||||
from typing import List, Tuple
|
||||
|
||||
from service.device_service import get_unique_client_ips
|
||||
|
||||
|
||||
def create_directory_structure():
|
||||
"""创建项目所需的目录结构,为所有客户端IP预创建基础目录"""
|
||||
try:
|
||||
# 1. 创建根目录下的resource文件夹(存在则跳过,不覆盖子内容)
|
||||
resource_dir = Path("resource")
|
||||
resource_dir.mkdir(exist_ok=True)
|
||||
# print(f"确保resource目录存在: {resource_dir.absolute()}")
|
||||
|
||||
# 2. 在resource下创建dect文件夹
|
||||
dect_dir = resource_dir / "dect"
|
||||
dect_dir.mkdir(exist_ok=True)
|
||||
# print(f"确保dect目录存在: {dect_dir.absolute()}")
|
||||
|
||||
# 3. 在dect下创建三个模型文件夹
|
||||
model_dirs = ["ocr", "face", "yolo"]
|
||||
for model in model_dirs:
|
||||
model_dir = dect_dir / model
|
||||
model_dir.mkdir(exist_ok=True)
|
||||
# print(f"确保{model}模型目录存在: {model_dir.absolute()}")
|
||||
|
||||
# 4. 调用外部方法获取所有客户端IP地址
|
||||
try:
|
||||
# 调用外部ip_read()方法获取所有客户端IP地址列表
|
||||
all_ip_addresses = get_unique_client_ips()
|
||||
|
||||
# 确保返回的是列表类型
|
||||
@ -58,7 +57,6 @@ def create_directory_structure():
|
||||
|
||||
# 递归创建目录(存在则跳过,不覆盖)
|
||||
month_dir.mkdir(parents=True, exist_ok=True)
|
||||
# print(f"为客户端IP {ip} 创建/确保目录存在: {month_dir.absolute()}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"处理客户端IP和日期目录时发生错误: {str(e)}")
|
||||
@ -67,52 +65,68 @@ def create_directory_structure():
|
||||
print(f"创建基础目录结构时发生错误: {str(e)}")
|
||||
|
||||
|
||||
def get_image_save_path(model_type: str, client_ip: str) -> tuple:
|
||||
def get_image_save_path(model_type: str, client_ip: str) -> Tuple[str, str]:
|
||||
"""
|
||||
获取图片保存的「完整路径」和「显示用短路径」
|
||||
获取图片保存的「本地完整路径」和「带路由前缀的显示路径」
|
||||
|
||||
参数:
|
||||
model_type: 模型类型,应为"ocr"、"face"或"yolo"
|
||||
client_ip: 检测到违禁的客户端IP地址(原始格式,如192.168.1.101)
|
||||
|
||||
返回:
|
||||
元组 (完整保存路径, 显示用短路径);若出错则返回 ("", "")
|
||||
元组 (本地完整保存路径, 带/api/file/前缀的显示路径);若出错则返回 ("", "")
|
||||
"""
|
||||
try:
|
||||
# 验证模型类型有效性
|
||||
valid_models = ["ocr", "face", "yolo"]
|
||||
if model_type not in valid_models:
|
||||
raise ValueError(f"无效的模型类型: {model_type},必须是{valid_models}之一")
|
||||
|
||||
# 1. 验证客户端IP有效性(检查是否在已知IP列表中)
|
||||
all_ip_addresses = get_unique_client_ips()
|
||||
if not isinstance(all_ip_addresses, list):
|
||||
all_ip_addresses = [all_ip_addresses]
|
||||
valid_ips = [ip.strip() for ip in all_ip_addresses if ip.strip()]
|
||||
|
||||
if client_ip.strip() not in valid_ips:
|
||||
client_ip_stripped = client_ip.strip()
|
||||
if client_ip_stripped not in valid_ips:
|
||||
raise ValueError(f"客户端IP {client_ip} 不在已知IP列表中,无法保存文件")
|
||||
|
||||
# 2. 处理IP地址(与目录创建逻辑一致,将.替换为_)
|
||||
safe_ip = client_ip.strip().replace(".", "_")
|
||||
# 2. 处理IP地址(将.替换为_,避免路径问题)
|
||||
safe_ip = client_ip_stripped.replace(".", "_")
|
||||
|
||||
# 3. 获取当前日期和毫秒级时间戳(确保文件名唯一)
|
||||
now = datetime.datetime.now()
|
||||
current_year = str(now.year)
|
||||
current_month = str(now.month)
|
||||
current_day = str(now.day)
|
||||
# 时间戳格式:年月日时分秒毫秒(如20250910143050123)
|
||||
timestamp = now.strftime("%Y%m%d%H%M%S%f")[:-3]
|
||||
current_month = str(now.month).zfill(2) # 确保月份为两位数
|
||||
current_day = str(now.day).zfill(2) # 确保日期为两位数
|
||||
timestamp = now.strftime("%Y%m%d%H%M%S%f")[:-3] # 取毫秒级时间戳
|
||||
|
||||
# 4. 定义基础目录(用于生成相对路径)
|
||||
base_dir = Path("resource") / "dect" # 显示路径会去掉这个前缀
|
||||
base_dir = Path("resource") / "dect"
|
||||
# 构建日级目录(完整路径:resource/dect/{model}/{safe_ip}/{年}/{月}/{日})
|
||||
day_dir = base_dir / model_type / safe_ip / current_year / current_month / current_day
|
||||
day_dir.mkdir(parents=True, exist_ok=True) # 确保日目录存在
|
||||
day_dir.mkdir(parents=True, exist_ok=True) # 确保目录存在
|
||||
|
||||
# 5. 构建唯一文件名
|
||||
image_filename = f"dect_{model_type}_{safe_ip}_{current_year}{current_month}{current_day}_{timestamp}.jpg"
|
||||
|
||||
# 6. 生成完整路径(用于实际保存图片)和显示路径(用于打印)
|
||||
full_path = day_dir / image_filename # 完整路径:resource/dect/.../xxx.jpg
|
||||
display_path = full_path.relative_to(base_dir) # 短路径:{model}/.../xxx.jpg(去掉resource/dect)
|
||||
# 6. 生成「本地完整路径」(使用系统路径,但在字符串表示时统一为正斜杠)
|
||||
local_full_path = day_dir / image_filename
|
||||
# 转换为字符串并统一使用正斜杠
|
||||
local_full_path_str = str(local_full_path).replace("\\", "/")
|
||||
|
||||
return str(full_path), str(display_path)
|
||||
# 7. 生成带路由前缀的显示路径(核心修改部分)
|
||||
# 获取项目根目录(base_dir是resource/dect,向上两级即为项目根目录)
|
||||
project_root = base_dir.parents[1]
|
||||
# 计算相对于项目根目录的路径(包含resource/dect层级)
|
||||
relative_path = local_full_path.relative_to(project_root)
|
||||
# 转换为字符串并统一使用正斜杠
|
||||
relative_path_str = str(relative_path).replace("\\", "/")
|
||||
# 拼接路由前缀
|
||||
routed_display_path = f"/api/file/{relative_path_str}"
|
||||
|
||||
return local_full_path_str, routed_display_path
|
||||
|
||||
except Exception as e:
|
||||
print(f"获取图片保存路径时发生错误: {str(e)}")
|
||||
|
||||
Reference in New Issue
Block a user