登录系统以及超级管理员权限
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
import os
|
||||
import shutil
|
||||
import json
|
||||
import re # [新增] 引入正则模块用于解析路径
|
||||
import re
|
||||
from datetime import datetime
|
||||
from flask import Blueprint, jsonify, request
|
||||
from sqlalchemy import desc, or_
|
||||
@ -17,6 +17,27 @@ except ImportError:
|
||||
api_bp = Blueprint('api', __name__, url_prefix='/api')
|
||||
|
||||
|
||||
# =======================
|
||||
# 0. 认证接口
|
||||
# =======================
|
||||
|
||||
@api_bp.route('/login', methods=['POST'])
|
||||
def login():
|
||||
data = request.get_json()
|
||||
username = data.get('username')
|
||||
password = data.get('password')
|
||||
|
||||
if username == 'admin' and password == 'licahk':
|
||||
return jsonify({
|
||||
'code': 200,
|
||||
'message': '登录成功',
|
||||
'token': 'super-admin-token-2026',
|
||||
'user': {'username': 'admin', 'role': 'administrator'}
|
||||
})
|
||||
|
||||
return jsonify({'code': 401, 'message': '用户名或密码错误'}), 401
|
||||
|
||||
|
||||
# =======================
|
||||
# 1. 设备概览与详情接口
|
||||
# =======================
|
||||
@ -34,7 +55,7 @@ def devices_overview():
|
||||
@api_bp.route('/device_data_by_date', methods=['GET'])
|
||||
def device_data_by_date():
|
||||
name = request.args.get('name')
|
||||
date_str = request.args.get('date') # 前端传来的格式通常是 YYYY-MM-DD
|
||||
date_str = request.args.get('date')
|
||||
|
||||
if not name or not date_str:
|
||||
return jsonify({'code': 400, 'message': 'Missing name or date'}), 400
|
||||
@ -44,9 +65,6 @@ def device_data_by_date():
|
||||
return jsonify({'code': 404, 'message': 'Device not found'}), 404
|
||||
|
||||
content = None
|
||||
|
||||
# 1. 查历史表
|
||||
# 注意:如果数据是通过 run_monitor 经过处理保存的,data_time 应该是标准的 YYYY-MM-DD 格式
|
||||
history_record = DeviceHistory.query.filter(
|
||||
DeviceHistory.device_id == device.id,
|
||||
DeviceHistory.data_time.like(f"{date_str}%")
|
||||
@ -54,8 +72,6 @@ def device_data_by_date():
|
||||
|
||||
if history_record:
|
||||
content = history_record.json_data
|
||||
|
||||
# 2. 查当前状态 (如果历史表没查到,且当前状态的时间也匹配)
|
||||
elif device.latest_time and device.latest_time.startswith(date_str):
|
||||
content = device.json_data
|
||||
|
||||
@ -66,8 +82,7 @@ def device_data_by_date():
|
||||
'source': device.source,
|
||||
'content': content
|
||||
})
|
||||
else:
|
||||
return jsonify({'code': 404, 'message': 'No data for this date'}), 404
|
||||
return jsonify({'code': 404, 'message': 'No data for this date'}), 404
|
||||
|
||||
|
||||
# =======================
|
||||
@ -81,7 +96,6 @@ def get_logs():
|
||||
end_date = request.args.get('end_date')
|
||||
|
||||
query = MaintenanceLog.query
|
||||
|
||||
if keyword:
|
||||
kw = f"%{keyword}%"
|
||||
query = query.filter(or_(
|
||||
@ -125,20 +139,14 @@ def add_log():
|
||||
def update_log():
|
||||
data = request.get_json()
|
||||
log_id = data.get('id')
|
||||
|
||||
if not log_id:
|
||||
return jsonify({'code': 400, 'message': 'Missing Log ID'}), 400
|
||||
|
||||
log = MaintenanceLog.query.get(log_id)
|
||||
if not log:
|
||||
return jsonify({'code': 404, 'message': 'Log not found'}), 404
|
||||
if not log: return jsonify({'code': 404, 'message': 'Not found'}), 404
|
||||
|
||||
try:
|
||||
log.device_name = data.get('device_name', log.device_name)
|
||||
log.engineer = data.get('engineer', log.engineer)
|
||||
log.location = data.get('location', log.location)
|
||||
log.content = data.get('content', log.content)
|
||||
|
||||
db.session.commit()
|
||||
return jsonify({'code': 200, 'message': 'Log updated'})
|
||||
except Exception as e:
|
||||
@ -158,15 +166,13 @@ def delete_log():
|
||||
|
||||
|
||||
# =======================
|
||||
# 3. 辅助与控制接口 (核心修改逻辑在 run_monitor)
|
||||
# 3. 辅助与控制接口 (核心修复逻辑)
|
||||
# =======================
|
||||
|
||||
def calculate_offset(latest_time_str):
|
||||
if not latest_time_str or latest_time_str == "N/A": return "从未同步"
|
||||
try:
|
||||
# 处理可能包含 _ 或 - 的日期
|
||||
clean = str(latest_time_str).split()[0].replace('_', '-')
|
||||
if len(clean) < 8: return latest_time_str
|
||||
target = datetime.strptime(clean, "%Y-%m-%d").date()
|
||||
diff = (datetime.now().date() - target).days
|
||||
return "当天已同步" if diff == 0 else f"滞后 {diff} 天"
|
||||
@ -195,40 +201,30 @@ def run_monitor():
|
||||
source = item.get('source', '')
|
||||
target_time = item.get('target_time')
|
||||
|
||||
# ================= [核心修改部分 START] =================
|
||||
# 针对 106 网站的数据,从 path 中解析标准时间
|
||||
# 格式示例: "path": "/Data/2026_01_08/xiwuzhu_16_29_28.csv"
|
||||
# 目标格式: "2026-01-08 16:29:28"
|
||||
# 处理 106 路径时间
|
||||
if '106' in str(source):
|
||||
try:
|
||||
path_str = d_raw.get('path', '')
|
||||
# 正则匹配日期 (YYYY_MM_DD) 和 时间 (HH_MM_SS)
|
||||
# 解释:/Data/(年_月_日)/任意字符_(时_分_秒).csv
|
||||
match = re.search(r'/Data/(\d{4}_\d{2}_\d{2})/\w+_(\d{2}_\d{2}_\d{2})\.csv', path_str)
|
||||
|
||||
if match:
|
||||
date_part = match.group(1).replace('_', '-') # 2026_01_08 -> 2026-01-08
|
||||
time_part = match.group(2).replace('_', ':') # 16_29_28 -> 16:29:28
|
||||
extracted_time = f"{date_part} {time_part}"
|
||||
|
||||
# 覆盖爬虫原本获取的可能不准确的时间
|
||||
target_time = extracted_time
|
||||
item['target_time'] = extracted_time
|
||||
except Exception as parse_err:
|
||||
print(f"Error parsing 106 path: {parse_err}")
|
||||
# ================= [核心修改部分 END] =================
|
||||
target_time = f"{match.group(1).replace('_', '-')} {match.group(2).replace('_', ':')}"
|
||||
except:
|
||||
pass
|
||||
|
||||
json_str = json.dumps(d_raw, ensure_ascii=False) if isinstance(d_raw, (dict, list)) else str(d_raw)
|
||||
|
||||
# --- 关键修改:先查询,后更新 ---
|
||||
device = Device.query.filter_by(name=d_name).first()
|
||||
if not device:
|
||||
device = Device(name=d_name, source=source)
|
||||
# 只有新设备才初始化静态字段
|
||||
device = Device(name=d_name, source=source, install_site="")
|
||||
db.session.add(device)
|
||||
db.session.flush() # 获取ID
|
||||
db.session.flush() # 获取 ID 供 History 使用
|
||||
|
||||
# 仅更新动态抓取的字段,保留手动填写的 install_site, is_maintaining, is_hidden
|
||||
device.status = item.get('status')
|
||||
device.current_value = item.get('value')
|
||||
device.latest_time = target_time # 使用解析后的时间
|
||||
device.latest_time = target_time
|
||||
device.check_time = current_check_time
|
||||
device.json_data = json_str
|
||||
device.offset = calculate_offset(target_time)
|
||||
@ -237,14 +233,14 @@ def run_monitor():
|
||||
device_id=device.id,
|
||||
status=item.get('status'),
|
||||
result_data=item.get('value'),
|
||||
data_time=target_time, # 存入标准时间,方便查询
|
||||
data_time=target_time,
|
||||
json_data=json_str
|
||||
)
|
||||
db.session.add(new_history)
|
||||
count += 1
|
||||
|
||||
db.session.commit()
|
||||
return jsonify({'code': 200, 'message': f'更新 {count} 台设备'})
|
||||
return jsonify({'code': 200, 'message': f'成功更新 {count} 台设备,资料已保留'})
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return jsonify({'code': 500, 'message': str(e)})
|
||||
|
||||
Reference in New Issue
Block a user