From b6c8b62571142cdc85060671c80d1a2a6e8b77bc Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 30 六月 2025 15:32:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/智能网联_25-0305_617_v1
---
Client/魏强/document/log_table_structure.docx | 0
/dev/null | 0
Client/魏强/log/日志_魏强_0630.doc | 0
Client/魏强/code/LogExportModule_PageSizeFinal.zip | 0
Client/魏强/code/log_table.sql | 23 +++++++++++++++++++++++
Client/魏强/document/日志需求分析文档.docx | 0
6 files changed, 23 insertions(+), 0 deletions(-)
diff --git "a/Client/\351\255\217\345\274\272/code/LogExportModule_PageSizeFinal.zip" "b/Client/\351\255\217\345\274\272/code/LogExportModule_PageSizeFinal.zip"
new file mode 100644
index 0000000..221cc7d
--- /dev/null
+++ "b/Client/\351\255\217\345\274\272/code/LogExportModule_PageSizeFinal.zip"
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/code/log_table.sql" "b/Client/\351\255\217\345\274\272/code/log_table.sql"
new file mode 100644
index 0000000..14cf323
--- /dev/null
+++ "b/Client/\351\255\217\345\274\272/code/log_table.sql"
@@ -0,0 +1,23 @@
+-- 鍒涘缓鏃ュ織琛�
+CREATE TABLE IF NOT EXISTS log_entries (
+ id INTEGER PRIMARY KEY AUTOINCREMENT, -- 涓婚敭锛岃嚜澧� ID
+ timestamp DATETIME NOT NULL, -- 鏃ュ織鏃堕棿鎴�
+ level VARCHAR(10) NOT NULL, -- 鏃ュ織绾у埆锛圛NFO/WARN/ERROR锛�
+ module VARCHAR(50), -- 鎵�灞炴ā鍧楋紙濡侷PC銆乁I锛�
+ source_file VARCHAR(100), -- 鏉ユ簮鏂囦欢鍚�
+ line_number INTEGER, -- 琛屽彿
+ message TEXT NOT NULL, -- 鏃ュ織娑堟伅
+ extra TEXT -- 鍙�夋墿灞曚俊鎭紙濡侸SON瀛楃涓诧級
+);
+
+-- 鎻掑叆绀轰緥鏁版嵁
+INSERT INTO log_entries (timestamp, level, module, source_file, line_number, message, extra)
+VALUES (
+ '2025-06-29 16:00:00',
+ 'ERROR',
+ 'CAN',
+ 'can_driver.cpp',
+ 125,
+ 'CAN 璁惧鍒濆鍖栧け璐�',
+ '{"thread_id": "0x12345", "user_id": "admin"}'
+);
diff --git "a/Client/\351\255\217\345\274\272/document/log_table_structure.docx" "b/Client/\351\255\217\345\274\272/document/log_table_structure.docx"
new file mode 100644
index 0000000..37508ed
--- /dev/null
+++ "b/Client/\351\255\217\345\274\272/document/log_table_structure.docx"
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/document/\346\227\245\345\277\227\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.docx" "b/Client/\351\255\217\345\274\272/document/\346\227\245\345\277\227\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.docx"
index aa9f15a..624e618 100644
--- "a/Client/\351\255\217\345\274\272/document/\346\227\245\345\277\227\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.docx"
+++ "b/Client/\351\255\217\345\274\272/document/\346\227\245\345\277\227\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.docx"
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc" "b/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc"
deleted file mode 100644
index 035e78c..0000000
--- "a/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc"
+++ /dev/null
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/log/~WRL0005.tmp" "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0630.doc"
similarity index 87%
rename from "Client/\351\255\217\345\274\272/log/~WRL0005.tmp"
rename to "Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0630.doc"
index c938328..c1d7ece 100644
--- "a/Client/\351\255\217\345\274\272/log/~WRL0005.tmp"
+++ "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0630.doc"
Binary files differ
--
Gitblit v1.8.0