feat(ips): 批量补全厂商功能 + MAC厂商替换为IEEE OUI数据库

前端:
- IPs.vue: 新增「补全厂商」按钮,选中网段后一键补全
- scanApi: 新增 batchFillVendor/batchDiscoverHostname + enable_netbios 参数

后端:
- enhanced_scan.py: 新增 POST /scan/batch/vendor 批量补全厂商端点
- enhanced_scan.py: 新增 POST /scan/batch/hostname 批量发现主机名端点
- scan_tasks.py: 透传 enable_netbios 参数
This commit is contained in:
Your Name
2026-07-18 10:59:27 +08:00
parent ccd7fbe2f0
commit 9e34f6f0f9
3 changed files with 110 additions and 2 deletions
+76
View File
@@ -156,6 +156,82 @@ def netbios_lookup(ip_address: str, timeout: int = 3):
"hostname": hostname or "Unknown"
}
@router.post("/batch/vendor", summary="批量补全厂商信息")
def batch_fill_vendor(
network_id: Optional[int] = None,
db: Session = Depends(get_db)
):
"""
对已有 MAC 地址但缺少厂商信息的 IP 批量补全厂商(使用 IEEE OUI 数据库)
"""
from app.models.network import IPAddress as IPAddressModel
query = db.query(IPAddressModel).filter(
IPAddressModel.mac_address.isnot(None),
IPAddressModel.vendor.is_(None)
)
if network_id:
query = query.filter(IPAddressModel.network_id == network_id)
items = query.all()
updated_count = 0
for ip in items:
vendor = EnhancedScanService.get_mac_vendor(ip.mac_address)
if vendor:
ip.vendor = vendor
updated_count += 1
if updated_count > 0:
db.commit()
return {
"message": f"已补全 {updated_count} 条厂商信息",
"checked": len(items),
"updated": updated_count
}
@router.post("/batch/hostname", summary="批量发现主机名")
def batch_discover_hostname(
network_id: Optional[int] = None,
enable_dns: bool = True,
enable_netbios: bool = True,
db: Session = Depends(get_db)
):
"""
对已有 MAC 地址但缺少主机名的 IP 批量执行主机名发现(DNS PTR + NetBIOS
"""
from app.models.network import IPAddress as IPAddressModel
query = db.query(IPAddressModel).filter(
IPAddressModel.mac_address.isnot(None),
IPAddressModel.hostname.is_(None)
)
if network_id:
query = query.filter(IPAddressModel.network_id == network_id)
items = query.all()
updated_count = 0
for ip in items:
hostname = None
if enable_dns:
hostname = EnhancedScanService.reverse_dns_lookup(ip.ip_address, timeout=2)
if not hostname and enable_netbios:
hostname = EnhancedScanService.netbios_lookup(ip.ip_address, timeout=3)
if hostname:
ip.hostname = hostname
updated_count += 1
if updated_count > 0:
db.commit()
return {
"message": f"已发现 {updated_count} 条主机名",
"checked": len(items),
"updated": updated_count
}
@router.get("/online/ips", summary="获取所有在线IP列表")
def get_online_ips(