v6ole/H3ConuMS-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: v0.9.0 新增记录日志、设备更换记录及IMC服务集成

Browse Source 
- 新增 RecordsLog.vue 操作记录日志页面
- 新增 ReplacementRecords.vue 设备更换记录页面
- 新增 imc_service.py IMC网管系统集成服务
- 新增 datetime.js 前端日期时间工具函数
- 新增 OLT时间同步.md 文档
- 扩展 devices.py API：设备更换记录、批量操作等
- 扩展 ssh_service.py：OLT时间同步功能
- 扩展 olt.py：新增时间同步相关接口
- 更新 DeviceList.vue：增强设备列表功能
- 更新路由和导航菜单
- 将 .claude/ 和 .mcp.json 加入 .gitignore

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
v6ole
2026-05-12 10:36:06 +08:00
parent eaabebbceb
commit 5aadbc78c6
24 changed files with 2830 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/services/imc_service.py
+227
View File
@@ -0,0 +1,227 @@
"""
iMC REST API 服务
- 使用 HTTP Digest Access Authentication (RFC 2617)
- 支持 nonce 过期自动续约（401 时自动重新握手）
- 功能：ONU 远程重启、光功率查询
"""
import hashlib
import re
import json
import time
import threading
import logging
import requests
from app.core.config import settings
logger = logging.getLogger(__name__)
# iMC 重启错误码映射
REBOOT_ERROR_CODES = {
'103': 'ONU不存在',
'119': 'SNMP连接超时',
'120': '业务割接失败',
'121': 'ONU未运行',
'122': '重启失败',
}
# 并发控制：防止同一设备被重复重启
_reboot_locks: dict = {}
_reboot_lock = threading.Lock()
def _normalize_mac(mac: str) -> str:
"""标准化 MAC 为 iMC 要求的格式：1484-7790-4840（大写，4位分组）"""
clean = mac.replace(':', '').replace('-', '').replace('.', '').upper()
return f"{clean[0:4]}-{clean[4:8]}-{clean[8:12]}"
class IMCService:
"""iMC REST API 服务封装"""
def __init__(self):
self.base_url = settings.IMC_API_URL.rstrip('/')
self.username = settings.IMC_API_USERNAME
self.password = settings.IMC_API_PASSWORD
self.verify_ssl = settings.IMC_API_VERIFY_SSL
self.connect_timeout = settings.IMC_CONNECT_TIMEOUT
self.read_timeout = settings.IMC_READ_TIMEOUT
self.session = requests.Session()
self.realm = "iMC RESTful Web Services"
self.nonce = None
self.nc = 1
# ── Digest 认证 ──────────────────────────────────────────────────────────
def _get_digest_auth_header(self, method: str, uri: str) -> str | None:
"""构建 HTTP Digest 认证头，首次调用自动握手获取 nonce"""
if not self.nonce:
try:
resp = self.session.get(
f"{self.base_url}{uri}",
verify=self.verify_ssl,
headers={"Accept": "application/json"},
timeout=(self.connect_timeout, self.read_timeout),
)
if resp.status_code == 401 and 'WWW-Authenticate' in resp.headers:
auth_parts = {}
for part in resp.headers['WWW-Authenticate'].split(','):
if '=' in part:
k, v = part.split('=', 1)
auth_parts[k.strip()] = v.strip(' "')
self.nonce = auth_parts.get('nonce', '')
self.realm = auth_parts.get('realm', self.realm)
else:
logger.error(f"获取 nonce 失败，状态码: {resp.status_code}")
return None
except requests.Timeout:
raise TimeoutError("iMC 认证超时")
except Exception as e:
logger.error(f"获取 nonce 异常: {e}")
return None
cnonce = hashlib.md5(str(time.time()).encode()).hexdigest()[:16]
ha1 = hashlib.md5(f"{self.username}:{self.realm}:{self.password}".encode()).hexdigest()
ha2 = hashlib.md5(f"{method}:{uri}".encode()).hexdigest()
response_hash = hashlib.md5(
f"{ha1}:{self.nonce}:{self.nc:08d}:{cnonce}:auth:{ha2}".encode()
).hexdigest()
auth_value = (
f'Digest username="{self.username}", realm="{self.realm}", '
f'nonce="{self.nonce}", uri="{uri}", response="{response_hash}", '
f'qop=auth, nc={self.nc:08d}, cnonce="{cnonce}"'
)
self.nc += 1
return auth_value
def _clear_auth(self):
"""清除认证状态（nonce 过期时调用，下次请求自动重新握手）"""
self.nonce = None
self.nc = 1
# ── 重启 ONU ─────────────────────────────────────────────────────────────
def reboot_onu(self, mac: str) -> dict:
"""
远程重启 ONU 设备。
使用 per-MAC 锁防止同一设备并发重启。
"""
imc_mac = _normalize_mac(mac)
# 并发锁
with _reboot_lock:
if imc_mac not in _reboot_locks:
_reboot_locks[imc_mac] = threading.Lock()
lock = _reboot_locks[imc_mac]
if not lock.acquire(blocking=False):
return {"success": False, "message": "该设备正在重启中，请稍后再试"}
try:
for retry in range(2):
try:
uri = f"/imcrs/epon/onu/reboot?mac={imc_mac}"
auth = self._get_digest_auth_header("POST", uri)
if not auth:
return {"success": False, "message": "认证失败，无法发送重启请求"}
resp = self.session.post(
f"{self.base_url}{uri}",
headers={
"Accept": "application/xml",
"Content-Type": "application/xml",
"Content-Length": "0",
"Authorization": auth,
},
verify=self.verify_ssl,
timeout=(self.connect_timeout, self.read_timeout),
)
if resp.status_code == 200:
m = re.search(r"<errorCode>(\d+)</errorCode>", resp.text)
if m:
code = m.group(1)
msg = REBOOT_ERROR_CODES.get(code, f"未知错误(代码: {code})")
return {"success": False, "message": f"重启失败: {msg}"}
return {"success": True, "message": "设备正在重启，请稍后..."}
elif resp.status_code == 401:
self._clear_auth()
continue
return {"success": False, "message": f"重启请求失败(HTTP {resp.status_code})"}
except TimeoutError:
return {"success": False, "message": "iMC 接口超时，请稍后重试"}
except Exception as e:
logger.error(f"重启异常 (retry={retry}): {e}")
if retry == 0:
time.sleep(2)
continue
return {"success": False, "message": f"重启异常: {e}"}
return {"success": False, "message": "重启失败，已达最大重试次数"}
finally:
lock.release()
# ── 光功率查询 ────────────────────────────────────────────────────────────
def get_optical_power(self, mac: str) -> dict | None:
"""
获取 ONU 设备光功率信息。
返回 dict 或 None（失败时）。
"""
imc_mac = _normalize_mac(mac)
for retry in range(2):
try:
uri = f"/imcrs/epon/onu/onuLightWaneInfo?mac={imc_mac}"
auth = self._get_digest_auth_header("GET", uri)
if not auth:
logger.error("生成认证头失败，无法获取光功率")
return None
resp = self.session.get(
f"{self.base_url}{uri}",
headers={
"Accept": "application/json",
"Content-Type": "application/json",
"Authorization": auth,
},
verify=self.verify_ssl,
timeout=(self.connect_timeout, self.read_timeout),
)
if resp.status_code == 200:
try:
data = resp.json()
return {
"powerIn": data.get("powerIn"),
"powerOut": data.get("powerOut"),
"bindMac": data.get("bindMac"),
"devId": data.get("devId"),
"eponDevName": data.get("eponDevName"),
"oltIfName": data.get("oltIfName"),
"onuIfDesc": data.get("onuIfDesc"),
}
except json.JSONDecodeError as e:
logger.error(f"解析光功率 JSON 失败: {e}, 内容: {resp.text}")
return None
elif resp.status_code == 401:
self._clear_auth()
continue
logger.error(f"光功率 API 失败，状态码: {resp.status_code}")
return None
except requests.Timeout:
raise TimeoutError("iMC 光功率接口请求超时")
except Exception as e:
logger.error(f"获取光功率异常 (retry={retry}): {e}")
if retry == 0:
time.sleep(2)
continue
return None
return None
backend/app/services/import_service.py
+6 -8
View File
@@ -75,28 +75,26 @@ class ImportService:
def import_devices(self, records: List[Dict], olt_id: int = None) -> Dict:
"""批量导入设备，存在则更新，不存在则新增"""
success_count = 0
skip_count = 0
invalid_count = 0
created_count = 0
updated_count = 0
for record in records:
mac = record.get('mac_address', '')
if not mac:
skip_count += 1
continue
# 查询是否已存在该 MAC 地址
existing = self.db.query(ONUDevice).filter(ONUDevice.mac_address == mac).first()
if existing:
# 更新现有记录
# 更新现有记录（MAC 地址不变）
existing.region = record.get('region', '')
existing.school_name = record.get('school_name', '')
existing.building = record.get('building') or None
existing.place_type = record.get('place_type') or None
existing.room_number = record.get('room_number') or None
existing.notes = record.get('notes') or None
success_count += 1
updated_count += 1
else:
# 新增记录
device = ONUDevice(
@@ -110,8 +108,8 @@ class ImportService:
notes=record.get('notes') or None
)
self.db.add(device)
success_count += 1
created_count += 1
self.db.commit()
return {'success': success_count}
return {'success': created_count + updated_count, 'created': created_count, 'updated': updated_count}
backend/app/services/ssh_service.py
+79
View File
@@ -348,6 +348,85 @@ class SSHService:
send_and_wait("quit", ">", timeout=5)
return True
def sync_ntp(self, old_server: str, new_server: str) -> bool:
"""同步 NTP 时间服务器配置
流程: system-view -> undo ntp old -> ntp new -> clock timezone -> quit -> save force
old_server 若不存在会报错，直接忽略继续执行。
"""
if not self.shell:
raise Exception("SSH 未连接")
def send_and_wait(cmd: str, expect: str, timeout: int = 15) -> str:
self.shell.send(cmd + "\n")
buf = ""
deadline = time.time() + timeout
while time.time() < deadline:
if self.shell.recv_ready():
buf += self.shell.recv(4096).decode('utf-8', errors='ignore')
if expect in buf:
return buf
else:
time.sleep(0.2)
return buf
out = send_and_wait("system-view", "]")
if "]" not in out:
raise Exception("进入 system-view 失败")
# 删除旧 NTP 服务器（若不存在会报错，忽略即可）
send_and_wait(f"undo ntp-service unicast-server {old_server}", "]")
# 添加新 NTP 服务器
out = send_and_wait(f"ntp-service unicast-server {new_server}", "]")
if "]" not in out:
raise Exception(f"配置 NTP 服务器 {new_server} 失败")
# 设置时区为北京时间
out = send_and_wait("clock timezone Beijing add 08:00:00", "]")
if "]" not in out:
raise Exception("配置时区失败")
# 退出系统视图
send_and_wait("quit", ">")
# 强制保存配置
send_and_wait("save force", ">", timeout=30)
return True
def get_onu_events(self, port_id: str) -> list:
"""
查询 ONU 上下线事件记录
命令: display epon onu-event interface Onu{port_id}
返回: [{'date', 'time', 'event', 'status', 'datetime_str'}, ...]
时间按倒序（最新在前）返回
"""
output = self.execute_command(
f"display epon onu-event interface Onu{port_id}"
)
output = self._clean_output(output)
events = []
for line in output.splitlines():
line = line.strip()
m = re.match(r'(\d{4}/\d{2}/\d{2})\s+(\d{2}:\d{2}:\d{2})\s+(.+)', line)
if not m:
continue
date_str, time_str, rest = m.group(1), m.group(2), m.group(3).strip()
# 最后一个单词是 ONU Status（Up/Offline），前面整体是 Event 名称
parts = rest.rsplit(None, 1)
if len(parts) == 2:
event, status = parts[0].strip(), parts[1].strip()
else:
event, status = rest, ''
events.append({
'date': date_str,
'time': time_str,
'event': event,
'status': status,
'datetime_str': f"{date_str} {time_str}",
})
return events
def close(self):
"""关闭 SSH 连接"""
if self.client: