From b462e21965b8332b17ad3bdfa5ed38b67f4dc2bb Mon Sep 17 00:00:00 2001
From: Administrator <3174665893@qq.com>
Date: 星期五, 01 十一月 2024 10:04:44 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/2024kunlun_project_permisson.pro.user | 2
Client/姜可庚/code/2024kunlun_project_permisson/PmsClientSocket.cpp | 11 -
Client/姜可庚/code/2024kunlun_project_permisson/PmsClientSocket.h | 7
Client/姜可庚/code/2024kunlun_project_permisson/permissondialog.h | 2
Client/姜可庚/code/2024kunlun_project_permisson/main.cpp | 2
Server/陈楚丹/log/日志_陈楚丹_1031.doc | 0
Client/姜可庚/code/2024kunlun_project_permisson/permissondialog.cpp | 4
Server/马丽萍/document/日志需求分析文档.docx | 0
Server/马丽萍/code/log/log.cpp | 209 +++++++++++++++++++++++------
Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.h | 2
Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.cpp | 20 +-
Server/马丽萍/code/log/log.h | 44 +++--
Client/黎弘霖/code/Devices_Management_Struct.h | 107 +++++++++++++++
13 files changed, 329 insertions(+), 81 deletions(-)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/2024kunlun_project_permisson.pro.user" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/2024kunlun_project_permisson.pro.user"
index 1e45d46..afa3031 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/2024kunlun_project_permisson.pro.user"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/2024kunlun_project_permisson.pro.user"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2024-10-31T15:06:39. -->
+<!-- Written by QtCreator 4.5.0, 2024-10-31T16:02:45. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
index bf4d8d6..8449947 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
@@ -68,10 +68,9 @@
res = (QueryPmsResponse *)buf.data();
if(res->success){
vector<PmsQueryResult> vecs;
-
- for(int i =0;i<100;i++){
- PmsRes structRes =res->pmsList[i];
- if(*(int *)&structRes){
+ int pmsLen = res->head.len-sizeof(QueryPmsResponse);
+ for(int i =0;i<pmsLen;i+=sizeof(PmsRes)){
+ PmsRes structRes = *(PmsRes*)(res + sizeof(QueryPmsResponse) + i*sizeof(PmsRes));
PmsQueryResult res;
res.setName(string(structRes.name));
res.setUserNo(string(structRes.userNo));
@@ -83,12 +82,8 @@
res.setDevManage(structRes.devManage);
res.setProductPlan(structRes.productPlan);
res.setQueryHistory(structRes.queryHistory);
-
res.setPermissonType(string(structRes.permissonType));
-
vecs.push_back(res);
-
- }else break;
}
if(!vecs.empty()){
emit notifyDateChange(vecs);
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
index 2795585..0a0e535 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
@@ -72,11 +72,12 @@
typedef struct UserAboutPmsResponse{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
- PmsRes pmsList[100];
+ //PmsRes pmsList[100];
+ char pmsList[0];
UserAboutPmsResponse(){
head.type=QUERY_PMS_RES;
- memset(pmsList,0,sizeof(PmsRes));
- head.len = sizeof(UserAboutPmsResponse);
+// memset(pmsList,0,sizeof(PmsRes));
+// head.len = sizeof(UserAboutPmsResponse);
}
} QueryPmsResponse;
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/main.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/main.cpp"
index 41b03d3..9200eaf 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/main.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/main.cpp"
@@ -6,6 +6,8 @@
QApplication a(argc, argv);
PermissonWindow w;
w.show();
+ QString dlgTitle = "鏇存柊缁撴灉";
+ QString strInfo = "鏉冮檺淇℃伅鏇存柊鎴愬姛";
return a.exec();
}
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.cpp"
index 258f81e..98d0f81 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.cpp"
@@ -66,6 +66,8 @@
btnList[3][res.getDevManage()]->setChecked(true);
btnList[4][res.getProductPlan()]->setChecked(true);
+ curRes = res;
+
}
@@ -80,7 +82,7 @@
param.setDevManage(findBoxCheck(btnList[3]));
param.setProductPlan(findBoxCheck(btnList[4]));
-
+ param.setRoleId(curRes.getRoleId());
client->updatePmsByParam(param);
}
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.h"
index 3ddff06..ecf68b2 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissondialog.h"
@@ -28,6 +28,8 @@
int findBoxCheck(map<int,QRadioButton *> map);
+ PmsQueryResult curRes;
+
private slots:
void recvUserNo(PmsQueryResult pms);
void on_buttonBox_accepted();
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
index cd23094..71580ef 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
@@ -78,9 +78,11 @@
+
connect(ac1,&QAction::triggered,[=]{
int row = ui->tableView->currentIndex().row();
- qDebug() << globalPms[row].getDevManage();
+ qDebug() << "鏇存柊褰撳墠鍛樺伐淇℃伅"
+ << QString::fromStdString( globalPms[row].getUserNo());
// 鍙戦�佸憳宸ョ紪鍙蜂俊鎭�
emit sendUserNo(globalPms[row]);
@@ -99,7 +101,9 @@
if(watch == ui->tableView->viewport() || watch == ui->tableView->verticalHeader()->viewport()
|| watch == ui->tableView->horizontalHeader()->viewport()){
- if(event->type()==QEvent::MouseButtonPress && ((QMouseEvent *)event)->button()==Qt::RightButton){
+ if(event->type()==QEvent::MouseButtonPress
+ && ((QMouseEvent *)event)->button()==Qt::RightButton
+ && m_model->rowCount() > 0){
m->exec(QCursor::pos());
}
@@ -132,12 +136,14 @@
void PermissonWindow::listenItemChange(QStandardItem *item)
{
- qDebug() << "鏁版嵁寮�濮嬫洿鏂�";
QString localText = item->text();
- PmsPlusParma pm;
- pm.setPermissonType(localText.toStdString());
- pm.setRoleId(roleMap[localText.toStdString()]);
- clientSocket->updatePmsByParam(pm);
+ if(roleMap.count(localText.toStdString())){
+ qDebug() << "鍙戣捣鑱屼綅鏇存柊璇锋眰";
+ PmsPlusParma pm;
+ pm.setPermissonType(localText.toStdString());
+ pm.setRoleId(roleMap[localText.toStdString()]);
+ clientSocket->updatePmsByParam(pm);
+ }
}
void PermissonWindow::renderItemData(vector<PmsQueryResult> res)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
index aeb776b..a9f57be 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
@@ -10,6 +10,8 @@
#include "syncdatatodb.h"
#include "PmsClientSocket.h"
+#include <QMessageBox>
+
using namespace std;
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h" "b/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h"
new file mode 100644
index 0000000..70ae3d4
--- /dev/null
+++ "b/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h"
@@ -0,0 +1,107 @@
+#pragma once
+enum TypeInfo
+{
+ AD_Req,//添加设备请求
+ AD_Res,//添加设备响应
+ DD_Req,//关闭设备请求
+ DD_Res,//关闭设备请求
+ PD_Req,//暂停设备请求
+ PD_Res,//暂停设备请求
+};
+struct Head
+{
+ int type;
+ int len;
+};
+
+//添加设备
+struct ADReq
+{
+ Head head;
+ char Device_Name[32];
+ ADReq() {
+ head.type = AD_Req;
+ head.len = sizeof(AD_Req);
+ }
+
+};
+struct ADPermission
+{
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+};
+struct ADRes
+{
+ Head head;
+
+ ADPermission per;
+ ADRes() {
+ head.type = AD_Res;
+ head.len = sizeof(ADRes);
+ }
+
+};
+
+//关闭设备
+struct DDReq
+{
+ Head head;
+ char Device_Name[32];
+ DDReq() {
+ head.type = DD_Req;
+ head.len = sizeof(DDReq);
+ }
+};
+struct DDPermission
+{
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+};
+struct DDRes
+{
+ Head head;
+
+ DDPermission per;
+ DDRes() {
+ head.type = DD_Res;
+ head.len = sizeof(DDRes);
+ }
+};
+
+//暂停设备
+struct PDReq
+{
+ Head head;
+ char Device_Name[32];
+ PDReq() {
+ head.type = PD_Req;
+ head.len = sizeof(PDReq);
+ }
+};
+struct PDPermission
+{
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+};
+struct PDRes
+{
+ Head head;
+
+ PDPermission per;
+ PDRes() {
+ head.type = PD_Res;
+ head.len = sizeof(PDRes);
+ }
+};
\ No newline at end of file
diff --git "a/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1031.doc" "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1031.doc"
new file mode 100644
index 0000000..409d72e
--- /dev/null
+++ "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1031.doc"
Binary files differ
diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
index 9a0dbea..3c6e62c 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
+++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
@@ -1,21 +1,14 @@
-#include <string.h>
#include <time.h>
#include <chrono>
-#include <ctime>
#include <stdarg.h>
#include "log.h"
-#include <sstream>
#include <fstream>
#include <iostream>
-#include <chrono>
using namespace std;
// 鏋勯�犲嚱鏁�
-Log::Log() {
- m_count = 0; // 鍒濆鍖栨棩蹇楄鏁�
- m_is_async = false; // 鍒濆鍖栦负鍚屾
-}
+Log::Log() : m_count(0), m_is_async(false) {}
// 鏋愭瀯鍑芥暟
Log::~Log() {
@@ -24,31 +17,82 @@
}
}
-// 鎺ユ敹鍘熷鏃ュ織骞惰В鏋�
-void Log::receiveLog(const std::string &raw_log) {
- ParsedLog parsed_log = parseLog(raw_log);
- write_log(levelToInt(parsed_log.level), "%s [%s] %s", parsed_log.timestamp.c_str(), parsed_log.device_id.c_str(), parsed_log.content.c_str());
+//寮傛鍐欏叆
+void Log::async_write_log() {
+ while (m_is_async) {
+ char* log;
+ if (m_log_queue->pop(log)) {
+ ParsedLog parsed_log = parseLog(log);
+ write_log(INFO, "%s", log); // 鍏堝啓鍏ユ棩蹇楁枃浠�
+ writeLogToDatabase(parsed_log); // 鍐嶅啓鍏ユ暟鎹簱
+ delete[] log; // 閲婃斁鍐呭瓨
+ }
+ }
}
+bool Log::check_log_size() {
+ if (m_fp.tellp() >= max_size) {
+ rotate_logs(); // 濡傛灉鏃ュ織鏂囦欢澶у皬瓒呰繃鏈�澶у�硷紝杞崲鏃ュ織
+ return true;
+ }
+ return false;
+}
+
+
+// 鎺ユ敹鍘熷鏃ュ織骞惰В鏋�
+void Log::receiveLog(const char* raw_log) {
+ ParsedLog parsed_log = parseLog(raw_log);
+ write_log(levelToInt(parsed_log.level), "%s [%s] %s",
+ parsed_log.timestamp,
+ parsed_log.device_id,
+ parsed_log.content);
+}
+
+//鍐欏叆鏁版嵁搴�
+void Log::writeLogToDatabase(const ParsedLog& log) {
+ const char* sql = "INSERT INTO parsed_logs (timestamp, device_id, level, content, source, user_id) VALUES (?, ?, ?, ?, ?, ?)";
+ sqlite3_stmt* stmt;
+
+ if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+ cerr << "Error: Failed to prepare statement: " << sqlite3_errmsg(db) << endl;
+ return;
+ }
+
+ sqlite3_bind_text(stmt, 1, log.timestamp, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 2, log.device_id, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 3, log.level, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 4, log.content, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 5, log.source, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 6, log.user_id, -1, SQLITE_STATIC);
+
+ if (sqlite3_step(stmt) != SQLITE_DONE) {
+ cerr << "Error: Failed to execute statement: " << sqlite3_errmsg(db) << endl;
+ }
+
+ sqlite3_finalize(stmt); // 娓呯悊鍑嗗璇彞
+}
+
+
// 瑙ｆ瀽鏃ュ織瀛楃涓�
-ParsedLog Log::parseLog(const std::string &log) {
+ParsedLog Log::parseLog(const char* log) {
ParsedLog parsed_log;
- std::istringstream iss(log);
- std::string level;
+ char level[16];
// 璇诲彇鏃堕棿鎴炽�佽澶嘔D鍜屾棩蹇楃骇鍒�
- iss >> parsed_log.timestamp >> parsed_log.device_id >> level;
- std::getline(iss, parsed_log.content);
- parsed_log.level = level; // 璁剧疆瑙ｆ瀽鍚庣殑绾у埆
+ sscanf(log, "%s %s %s %[^\n]", parsed_log.timestamp, parsed_log.device_id, level, parsed_log.content);
+ // 璁剧疆瑙ｆ瀽鍚庣殑绾у埆
+ for (int i = 0; i < 16; ++i) {
+ parsed_log.level[i] = level[i];
+ }
return parsed_log;
}
// 鍒濆鍖栨棩蹇楃郴缁�
-bool Log::init(const std::string &file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size) {
+bool Log::init(const char* file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size) {
if (max_queue_size >= 1) {
m_is_async = true; // 鍚敤寮傛鍐欏叆
- m_log_queue = new block_queue<string>(max_queue_size); // 鍒涘缓闃诲闃熷垪
+ m_log_queue = new block_queue<char*>(max_queue_size); // 鍒涘缓闃诲闃熷垪
std::thread(&Log::flush_log_thread, this).detach(); // 鍒涘缓鍒锋柊鏃ュ織绾跨▼
}
@@ -60,43 +104,76 @@
time_t t = time(NULL);
struct tm *sys_tm = localtime(&t);
- std::string log_full_name;
+ char log_full_name[256];
// 鏍规嵁鏂囦欢璺緞鍜屽綋鍓嶆棩鏈熺敓鎴愬畬鏁存棩蹇楁枃浠跺悕
- if (file_name.find('/') == std::string::npos) {
- log_full_name = to_string(sys_tm->tm_year + 1900) + "_" + to_string(sys_tm->tm_mon + 1) + "_" + to_string(sys_tm->tm_mday) + "_" + file_name;
+ if (strchr(file_name, '/') == nullptr) {
+ sprintf(log_full_name, "%d_%d_%d_%s",
+ sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday, file_name);
} else {
- std::string log_name = file_name.substr(file_name.find_last_of('/') + 1);
- std::string dir_name = file_name.substr(0, file_name.find_last_of('/') + 1);
-
- log_full_name = dir_name + to_string(sys_tm->tm_year + 1900) + "_" + to_string(sys_tm->tm_mon + 1) + "_" + to_string(sys_tm->tm_mday) + "_" + log_name;
+ char log_name[128];
+ char dir_name[128];
+ char* last_slash = strrchr(file_name, '/');
+ int dir_len = last_slash - file_name + 1;
+ strncpy(dir_name, file_name, dir_len);
+ dir_name[dir_len] = '\0';
+ strcpy(log_name, last_slash + 1);
+
+ sprintf(log_full_name, "%s%d_%d_%d_%s",
+ dir_name, sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday, log_name);
}
m_today = sys_tm->tm_mday; // 璁板綍浠婂ぉ鐨勬棩鏈�
m_fp.open(log_full_name, std::ios::out | std::ios::app); // 鎵撳紑鏃ュ織鏂囦欢
if (!m_fp.is_open()) {
+ cerr << "Error: Could not open log file: " << log_full_name << endl;
return false; // 鎵撳紑澶辫触
}
return true; // 鍒濆鍖栨垚鍔�
}
-#include <chrono>
+//鏌ヨ鏃ュ織鑽夋渶
+void Log::queryLogs(const char *device_id) {
+ const char* sql = "SELECT * FROM parsed_logs WHERE device_id = ?";
+ sqlite3_stmt* stmt;
+ if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+ cerr << "Error: Failed to prepare statement: " << sqlite3_errmsg(db) << endl;
+ return;
+ }
+
+ sqlite3_bind_text(stmt, 1, device_id, -1, SQLITE_STATIC);
+
+ while (sqlite3_step(stmt) == SQLITE_ROW) {
+ cout << "Timestamp: " << sqlite3_column_text(stmt, 1) << ", "
+ << "Device ID: " << sqlite3_column_text(stmt, 2) << ", "
+ << "Level: " << sqlite3_column_text(stmt, 3) << ", "
+ << "Content: " << sqlite3_column_text(stmt, 4) << ", "
+ << "Source: " << sqlite3_column_text(stmt, 5) << ", "
+ << "User ID: " << sqlite3_column_text(stmt, 6) << endl;
+ }
+
+ sqlite3_finalize(stmt); // 娓呯悊鍑嗗璇彞
+}
+
+
+
+// 鍐欏叆鏃ュ織
void Log::write_log(int level, const char *format, ...) {
auto now = std::chrono::system_clock::now();
auto now_time_t = std::chrono::system_clock::to_time_t(now);
struct tm *sys_tm = localtime(&now_time_t);
- std::string s;
+ char s[32];
// 鏍规嵁鏃ュ織绾у埆璁剧疆鍓嶇紑
switch (level) {
- case DEBUG: s = "[debug]: "; break;
- case INFO: s = "[info]: "; break;
- case WARN: s = "[warn]: "; break;
- case ERROR: s = "[error]: "; break;
- default: s = "[info]: "; break;
+ case DEBUG: strcpy(s, "[debug]: "); break;
+ case INFO: strcpy(s, "[info]: "); break;
+ case WARN: strcpy(s, "[warn]: "); break;
+ case ERROR: strcpy(s, "[error]: "); break;
+ default: strcpy(s, "[info]: "); break;
}
m_mutex.lock(); // 閿佸畾浜掓枼浣�
@@ -104,7 +181,7 @@
// 妫�鏌ユ槸鍚﹂渶瑕佽疆鎹㈡棩蹇�
if (m_today != sys_tm->tm_mday || m_count % m_split_lines == 0) {
- // ... (鏃ュ織杞崲浠ｇ爜)
+ rotate_logs(); // 璋冪敤鏃ュ織杞崲鍑芥暟
}
// 鍐欏叆鏃ュ織鍐呭
@@ -113,6 +190,7 @@
vsnprintf(m_buf, m_log_buf_size, format, valist); // 鍐欏叆鏃ュ織鍐呭
m_fp << s << m_buf << std::endl; // 浣跨敤ofstream鍐欏叆鏂囦欢
+ va_end(valist);
m_mutex.unlock(); // 瑙ｉ攣浜掓枼浣�
@@ -133,18 +211,65 @@
void Log::flush_log_thread() {
while (m_is_async) {
// 浠庨槦鍒椾腑鑾峰彇鏃ュ織骞跺啓鍏�
- string log;
+ char* log;
if (m_log_queue->pop(log)) {
- write_log(INFO, "%s", log.c_str());
+ write_log(INFO, "%s", log);
}
}
}
+//杞崲瀛楃涓�
+const char* Log::log_level_to_string(int level) {
+ switch (level) {
+ case DEBUG: return "[debug]: ";
+ case INFO: return "[info]: ";
+ case WARN: return "[warn]: ";
+ case ERROR: return "[error]: ";
+ default: return "[info]: "; // 榛樿杩斿洖INFO
+ }
+}
+
// 鏃ュ織绾у埆杞崲涓烘暣鏁�
-int Log::levelToInt(const std::string &level) {
- if (level == "[debug]:") return DEBUG;
- if (level == "[info]:") return INFO;
- if (level == "[warn]:") return WARN;
- if (level == "[error]:") return ERROR;
+int Log::levelToInt(const char* level) {
+ if (strcmp(level, "[debug]:") == 0) return DEBUG;
+ if (strcmp(level, "[info]:") == 0) return INFO;
+ if (strcmp(level, "[warn]:") == 0) return WARN;
+ if (strcmp(level, "[error]:") == 0) return ERROR;
return INFO; // 榛樿杩斿洖INFO
}
+
+//鎵撳紑鍏抽棴鏁版嵁搴�
+void Log::openDatabase(const char *db_name) {
+ if (sqlite3_open(db_name, &db) != SQLITE_OK) {
+ cerr << "鎵撲笉寮�鏁版嵁搴擄紒锛侀敊璇細 " << sqlite3_errmsg(db) << endl;
+ }
+}
+
+void Log::closeDatabase() {
+ if (db) {
+ sqlite3_close(db);
+ }
+}
+
+// 鏃ュ織杞崲鍑芥暟
+void Log::rotate_logs() {
+ // 鍏抽棴褰撳墠鏂囦欢
+ m_fp.close();
+
+ // 鐢熸垚鏂版枃浠跺悕
+ time_t t = time(NULL);
+ struct tm *sys_tm = localtime(&t);
+ char new_log_name[256];
+ sprintf(new_log_name, "%d_%d_%d_log.txt",
+ sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday);
+
+ // 鎵撳紑鏂扮殑鏃ュ織鏂囦欢
+ m_fp.open(new_log_name, std::ios::out | std::ios::app);
+ if (!m_fp.is_open()) {
+ cerr << "Error: Could not open new log file: " << new_log_name << endl;
+ return;
+ }
+
+ m_today = sys_tm->tm_mday; // 鏇存柊浠婂ぉ鐨勬棩鏈�
+ m_count = 0; // 閲嶇疆鏃ュ織璁℃暟
+}
diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
index 37cc6bb..83df983 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
+++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
@@ -3,12 +3,12 @@
#include <stdio.h>
#include <iostream>
-#include <string>
#include <stdarg.h>
-#include <thread>
+#include <thread>
#include "block_queue.h"
-#include "locker.h"
+#include "locker.h"
#include <fstream>
+#include <sqlite3.h> // 娣诲姞 SQLite 鏁版嵁搴撶殑澶存枃浠�
using namespace std;
@@ -22,10 +22,12 @@
// 瀛樺偍瑙ｆ瀽鏃ュ織鏂囦欢鐨勭粨鏋勪綋
struct ParsedLog {
- std::string timestamp; // 鏃堕棿鎴�
- std::string device_id; // 璁惧ID
- std::string level; // 鏃ュ織绾у埆
- std::string content; // 鏃ュ織鍐呭
+ char timestamp[64]; // 鏃堕棿鎴�
+ char device_id[64]; // 璁惧ID
+ char level[16]; // 鏃ュ織绾у埆
+ char content[256]; // 鏃ュ織鍐呭
+ char source[64]; // 鏉ユ簮妯″潡
+ char user_id[64]; // 鐢ㄦ埛ID
};
class Log
@@ -42,17 +44,19 @@
void flush_log_thread(); // 淇敼涓洪潪闈欐�佹垚鍛樺嚱鏁�
// 鍒濆鍖栨棩蹇楃郴缁燂紝鍙傛暟鍖呮嫭鏂囦欢鍚嶃�佹槸鍚﹀叧闂棩蹇椼�佺紦鍐插尯澶у皬銆佹渶澶ц鏁板拰鏈�澶ч槦鍒楀ぇ灏�
- bool Log::init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
+ bool init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
-
// 鍐欏叆鏃ュ織
void write_log(int level, const char *format, ...);
// 鍒锋柊鏃ュ織鏂囦欢
void flush(void);
- //鎺ユ敹鍘熷鐨勮鍏叡绫�
- void receiveLog(const std::string& raw_log); // 鎺ユ敹鍘熷鏃ュ織
+ // 鎺ユ敹鍘熷鏃ュ織
+ void receiveLog(const char* raw_log);
+
+ // 灏嗘棩蹇楀啓鍏ユ暟鎹簱
+ void writeLogToDatabase(const ParsedLog& log);
private:
Log(); // 鏋勯�犲嚱鏁�
@@ -62,12 +66,12 @@
bool check_log_size(); // 妫�鏌ユ棩蹇楁枃浠跺ぇ灏�
void rotate_logs(); // 杞崲鏃ュ織鏂囦欢
- ParsedLog parseLog(const std::string& log); // 瑙ｆ瀽鏃ュ織
- bool init(const std::string &file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
- void queryLogs(const std::string &device_id); // 鏌ヨ鏃ュ織
+ ParsedLog parseLog(const char* log); // 瑙ｆ瀽鏃ュ織
+ bool init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
+ void queryLogs(const char *device_id); // 鏌ヨ鏃ュ織
const char* log_level_to_string(int level); // 灏嗘棩蹇楃骇鍒浆鎹负瀛楃涓�
- int levelToInt(const std::string &level);
+ int levelToInt(const char *level);
private:
char dir_name[128]; // 鏃ュ織鏂囦欢鐩綍
@@ -78,16 +82,18 @@
int m_today; // 璁板綍褰撳墠鏃堕棿
std::ofstream m_fp; // 灏� FILE * m_fp 鏇存敼涓� std::ofstream m_fp
char *m_buf; // 鏃ュ織缂撳啿鍖�
- block_queue<string> *m_log_queue; // 闃诲闃熷垪
+ block_queue<char*> *m_log_queue; // 闃诲闃熷垪
bool m_is_async; // 鏄惁寮傛鏍囧織浣�
locker m_mutex; // 浜掓枼閿�
int m_close_log; // 鍏抽棴鏃ュ織鐨勬爣蹇�
long max_size = 10 * 1024 * 1024; // 鍗曚釜鏃ュ織鏂囦欢鐨勫ぇ灏� 10MB
- //娴嬭瘯鏂囦欢閲岄潰鐨�
- int m_close_log; // 纭繚鍦ㄨ繖閲屽畾涔�
+
+ // 鏁版嵁搴撶浉鍏�
+ sqlite3 *db; // SQLite 鏁版嵁搴撴寚閽�
+ void openDatabase(const char *db_name); // 鎵撳紑鏁版嵁搴�
+ void closeDatabase(); // 鍏抽棴鏁版嵁搴�
};
-// 瀹忓畾涔夌敤浜庝笉鍚岀骇鍒殑鏃ュ織璁板綍
#define LOG_DEBUG(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(DEBUG, format, ##__VA_ARGS__); Log::get_instance()->flush();}
#define LOG_INFO(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(INFO, format, ##__VA_ARGS__); Log::get_instance()->flush();}
#define LOG_WARN(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(WARN, format, ##__VA_ARGS__); Log::get_instance()->flush();}
diff --git "a/Server/\351\251\254\344\270\275\350\220\215/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/Server/\351\251\254\344\270\275\350\220\215/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 13a9cda..8ce7464 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/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/Server/\351\251\254\344\270\275\350\220\215/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
--
Gitblit v1.8.0