修改后端获取gpu数据逻辑
Change-Id: I4069a1bf5a01155aed82f655fb374445e3158442
diff --git a/Merge/back_rhj/app/__pycache__/routes.cpython-310.pyc b/Merge/back_rhj/app/__pycache__/routes.cpython-310.pyc
index 46bb4b4..a1d7f76 100644
--- a/Merge/back_rhj/app/__pycache__/routes.cpython-310.pyc
+++ b/Merge/back_rhj/app/__pycache__/routes.cpython-310.pyc
Binary files differ
diff --git a/Merge/back_rhj/app/routes.py b/Merge/back_rhj/app/routes.py
index 0b60624..b23da6e 100644
--- a/Merge/back_rhj/app/routes.py
+++ b/Merge/back_rhj/app/routes.py
@@ -427,7 +427,10 @@
# 创建GpuWriter实例并获取数据
gpu_writer = GpuWriter(Config.SQLURL)
gpu_records = gpu_writer.get_latest_gpu_usage(limit)
-
+ print("-------------------------")
+ print(
+ gpu_records
+ )
return jsonify({
'success': True,
'data': {
diff --git a/Merge/back_rhj/app/utils/__pycache__/gpuwriter.cpython-310.pyc b/Merge/back_rhj/app/utils/__pycache__/gpuwriter.cpython-310.pyc
index f86da67..be08015 100644
--- a/Merge/back_rhj/app/utils/__pycache__/gpuwriter.cpython-310.pyc
+++ b/Merge/back_rhj/app/utils/__pycache__/gpuwriter.cpython-310.pyc
Binary files differ
diff --git a/Merge/back_rhj/app/utils/gpuwriter.py b/Merge/back_rhj/app/utils/gpuwriter.py
index 1e521f3..6c589d6 100644
--- a/Merge/back_rhj/app/utils/gpuwriter.py
+++ b/Merge/back_rhj/app/utils/gpuwriter.py
@@ -46,18 +46,18 @@
session = self.Session()
try:
records = session.query(GpuUsage)\
- .order_by(GpuUsage.timestamp.desc())\
+ .order_by(GpuUsage.created_at.desc())\
.limit(limit)\
.all()
result = []
for record in records:
result.append({
- 'id': record.id,
+ 'id': record.gpu_id, # 使用gpu_id作为id
'gpu_id': record.gpu_id,
'gpu_usage': record.gpu_usage,
'gpu_memory_usage': record.gpu_memory_usage,
- 'timestamp': record.timestamp.isoformat() if record.timestamp else None
+ 'timestamp': record.created_at.isoformat() if record.created_at else None
})
return result