From 56e411a5d22cf3201db9c93dce65f4a694afa0d5 Mon Sep 17 00:00:00 2001
From: gong <3218757026@qq.com>
Date: 星期六, 02 十一月 2024 10:37:44 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/朱航/log/朱航1031.doc | 0
Client/李宵增/document/历史查询分析模块需求分析.docx | 0
Server/马渝杭/log/日志_马渝杭_20241031.doc | 0
Server/王琨元/document/表.docx | 0
Server/李转转/log/配置管理_1101.doc | 0
Client/姜可庚/log/姜可庚_1101.doc | 0
Client/朱航/log/朱航1030.doc | 0
Client/刘子航/log/日志_刘子航_1101.doc | 0
Client/郑凯文/log/郑凯文1101.doc | 0
Client/宋昊昳/log/日志_宋昊昳_1102.doc | 0
Client/冀浩昶/log/日志_冀浩昶_1101.doc | 0
Server/王琨元/log/日志模板_王琨元_1031 .doc | 0
Server/马渝杭/log/日志_马渝杭_20241101.doc | 0
Client/朱航/log/朱航1101.doc | 0
Client/王鑫鑫/log/昆仑_1101项目日报.doc | 0
Client/黎弘霖/log/设备管理_黎弘霖_1101.doc | 0
Server/马渝杭/log/20241101昆仑日报.doc | 0
Server/王琨元/document/~$表.docx | 0
Server/陈楚丹/log/日志_陈楚丹_1031.doc | 0
Client/申烜/log/日志_申烜_1031.doc | 0
Server/马丽萍/document/日志需求分析文档.docx | 0
Client/李宵增/log/历史查询_李宵增_1031.doc | 0
/dev/null | 67 ----
Client/宋昊昳/log/日志_宋昊昳_1101.doc | 0
Server/马丽萍/code/log/log.cpp | 209 +++++++++++--
Server/马丽萍/code/log/log.h | 44 +-
Client/申烜/log/日志_申烜_1101.doc | 0
Client/黎弘霖/code/Devices_Management_Struct.h | 48 ++-
common.h | 524 +++++++++++++++++++++++-----------
Server/胡家明/log/日志_胡家明_1031.doc | 0
30 files changed, 579 insertions(+), 313 deletions(-)
diff --git "a/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1101.doc" "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1101.doc"
new file mode 100644
index 0000000..3c27051
--- /dev/null
+++ "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1101.doc"
Binary files differ
diff --git "a/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1101.doc" "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1101.doc"
new file mode 100644
index 0000000..5b39481
--- /dev/null
+++ "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1101.doc"
Binary files differ
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1101.doc" "b/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1101.doc"
new file mode 100644
index 0000000..f262959
--- /dev/null
+++ "b/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1101.doc"
Binary files differ
diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1101.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1101.doc"
new file mode 100644
index 0000000..b906225
--- /dev/null
+++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1101.doc"
Binary files differ
diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc"
new file mode 100644
index 0000000..7b40336
--- /dev/null
+++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc"
new file mode 100644
index 0000000..f1496da
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc"
new file mode 100644
index 0000000..ee2e85f
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc"
new file mode 100644
index 0000000..55be380
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc"
Binary files differ
diff --git "a/Client/\346\235\216\345\256\265\345\242\236/document/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220\346\250\241\345\235\227\351\234\200\346\261\202\345\210\206\346\236\220.docx" "b/Client/\346\235\216\345\256\265\345\242\236/document/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220\346\250\241\345\235\227\351\234\200\346\261\202\345\210\206\346\236\220.docx"
index 6b3025b..deffe06 100644
--- "a/Client/\346\235\216\345\256\265\345\242\236/document/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220\346\250\241\345\235\227\351\234\200\346\261\202\345\210\206\346\236\220.docx"
+++ "b/Client/\346\235\216\345\256\265\345\242\236/document/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220\346\250\241\345\235\227\351\234\200\346\261\202\345\210\206\346\236\220.docx"
Binary files differ
diff --git "a/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1031.doc" "b/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1031.doc"
new file mode 100644
index 0000000..593bbbc
--- /dev/null
+++ "b/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1031.doc"
Binary files differ
diff --git "a/Client/\347\216\213\351\221\253\351\221\253/log/\346\230\206\344\273\221_1101\351\241\271\347\233\256\346\227\245\346\212\245.doc" "b/Client/\347\216\213\351\221\253\351\221\253/log/\346\230\206\344\273\221_1101\351\241\271\347\233\256\346\227\245\346\212\245.doc"
new file mode 100644
index 0000000..4f8d51c
--- /dev/null
+++ "b/Client/\347\216\213\351\221\253\351\221\253/log/\346\230\206\344\273\221_1101\351\241\271\347\233\256\346\227\245\346\212\245.doc"
Binary files differ
diff --git "a/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\346\263\250\345\206\214\347\231\273\345\275\225_2024.10.31.doc" "b/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1031.doc"
similarity index 100%
rename from "Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\346\263\250\345\206\214\347\231\273\345\275\225_2024.10.31.doc"
rename to "Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1031.doc"
Binary files differ
diff --git "a/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1101.doc" "b/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1101.doc"
new file mode 100644
index 0000000..64bbd1f
--- /dev/null
+++ "b/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1101.doc"
Binary files differ
diff --git "a/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071101.doc" "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071101.doc"
new file mode 100644
index 0000000..7cbcb68
--- /dev/null
+++ "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071101.doc"
Binary files differ
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"
index 70ae3d4..67b38a2 100644
--- "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"
@@ -3,8 +3,8 @@
{
AD_Req,//添加设备请求
AD_Res,//添加设备响应
- DD_Req,//关闭设备请求
- DD_Res,//关闭设备请求
+ CD_Req,//关闭设备请求
+ CD_Res,//关闭设备请求
PD_Req,//暂停设备请求
PD_Res,//暂停设备请求
};
@@ -29,15 +29,22 @@
{
char Device_Name[32];
char Device_Status[32];
- char Start_Time[32];
- char Work_Time[32];
char Manufacturer[100];
char Devices_Type[32];
+ double Longitude;
+ double Latitude;
};
struct ADRes
{
Head head;
-
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+ double Longitude;
+ double Latitude;
ADPermission per;
ADRes() {
head.type = AD_Res;
@@ -47,16 +54,16 @@
};
//关闭设备
-struct DDReq
+struct CDReq
{
Head head;
char Device_Name[32];
- DDReq() {
- head.type = DD_Req;
- head.len = sizeof(DDReq);
+ CDReq() {
+ head.type = CD_Req;
+ head.len = sizeof(CDReq);
}
};
-struct DDPermission
+struct CDPermission
{
char Device_Name[32];
char Device_Status[32];
@@ -64,15 +71,18 @@
char Work_Time[32];
char Manufacturer[100];
char Devices_Type[32];
+ double Longitude;
+ double Latitude;
};
-struct DDRes
+struct CDRes
{
Head head;
-
- DDPermission per;
- DDRes() {
- head.type = DD_Res;
- head.len = sizeof(DDRes);
+ char Device_Status[32];
+ int status;
+ CDPermission per;
+ CDRes() {
+ head.type = CD_Res;
+ head.len = sizeof(CDRes);
}
};
@@ -94,11 +104,15 @@
char Work_Time[32];
char Manufacturer[100];
char Devices_Type[32];
+ double Longitude;
+ double Latitude;
};
struct PDRes
{
Head head;
-
+ char Device_Status[32];
+ char Work_Time[32];
+ int status;
PDPermission per;
PDRes() {
head.type = PD_Res;
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1101.doc" "b/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1101.doc"
new file mode 100644
index 0000000..c9ef8ff
--- /dev/null
+++ "b/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1101.doc"
Binary files differ
diff --git "a/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_1101.doc" "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_1101.doc"
new file mode 100644
index 0000000..051ea88
--- /dev/null
+++ "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_1101.doc"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx"
new file mode 100644
index 0000000..8b245e2
--- /dev/null
+++ "b/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\345\244\207\344\273\275\345\257\274\345\207\272.txt" "b/Server/\347\216\213\347\220\250\345\205\203/document/\345\244\207\344\273\275\345\257\274\345\207\272.txt"
deleted file mode 100644
index 79c8216..0000000
--- "a/Server/\347\216\213\347\220\250\345\205\203/document/\345\244\207\344\273\275\345\257\274\345\207\272.txt"
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# 鏁版嵁搴撹繛鎺ュ弬鏁�
-DB_USER="your_username"
-DB_PASS="your_password"
-DB_NAME="your_database_name"
-BACKUP_DIR="/path/to/backup/directory"
-
-# 鑾峰彇褰撳墠鏃ユ湡锛岀敤浜庢枃浠跺悕
-DATE=$(date +%Y%m%d%H%M%S)
-
-# 澶囦唤鏂囦欢鍚�
-BACKUP_FILE="${BACKUP_DIR}/backup_${DATE}.sql"
-
-# 鍒涘缓澶囦唤鐩綍锛堝鏋滀笉瀛樺湪锛�
-mkdir -p $BACKUP_DIR
-
-# 浣跨敤mysqldump杩涜鏁版嵁搴撳浠�
-mysqldump -u $DB_USER -p$DB_PASS $DB_NAME > $BACKUP_FILE
-
-if [ $? -eq 0 ]; then
- echo "鏁版嵁搴撳浠芥垚鍔燂細$BACKUP_FILE"
-else
- echo "鏁版嵁搴撳浠藉け璐�"
-fi
-
-# 娣诲姞瀹氭椂浠诲姟锛堜娇鐢╟rontab -e鏉ョ紪杈戝畾鏃朵换鍔★級
-# 渚嬪锛屾瘡澶╁噷鏅�2鐐规墽琛屽浠�
-# 0 2 * * * /path/to/this/script.sh
\ No newline at end of file
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\345\273\272\350\241\250.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/\345\273\272\350\241\250.docx"
deleted file mode 100644
index ed3cc7a..0000000
--- "a/Server/\347\216\213\347\220\250\345\205\203/document/\345\273\272\350\241\250.docx"
+++ /dev/null
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx"
new file mode 100644
index 0000000..4c098dd
--- /dev/null
+++ "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\351\230\262\346\263\250\345\205\245.txt" "b/Server/\347\216\213\347\220\250\345\205\203/document/\351\230\262\346\263\250\345\205\245.txt"
deleted file mode 100644
index 19a2f6c..0000000
--- "a/Server/\347\216\213\347\220\250\345\205\203/document/\351\230\262\346\263\250\345\205\245.txt"
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <iostream>
-#include <mysql_driver.h>
-#include <mysql_connection.h>
-#include <cppconn/statement.h>
-#include <cppconn/prepared_statement.h>
-#include <cppconn/resultset.h>
-#include <string>
-#include <regex>
-
-class DatabaseUtils {
-public:
- // 杩炴帴鏁版嵁搴�
- static sql::Connection* connect() {
- try {
- sql::mysql::MySQL_Driver* driver = sql::mysql::get_mysql_driver_instance();
- sql::Connection* con = driver->connect("tcp://127.0.0.1:3306", "mayi", "123456");
- con->setSchema("your_database");
- return con;
- } catch (sql::SQLException& e) {
- std::cerr << "鏁版嵁搴撹繛鎺ラ敊璇�: " << e.what() << std::endl;
- return nullptr;
- }
- }
-
- // 妫�鏌QL璇彞鏄惁瀛樺湪娼滃湪娉ㄥ叆椋庨櫓锛堢畝鍗曟鍒欐牎楠岋級
- static bool isSafeSQL(const std::string& sql) {
- // 绠�鍗曠殑姝ｅ垯琛ㄨ揪寮忥紝闃叉甯歌鐨勬敞鍏ュ叧閿瘝
- std::regex injectionRegex("(drop|delete|update|insert|select\\s+\\*\\s+from)", std::regex_constants::icase);
- return!std::regex_search(sql, injectionRegex);
- }
-
- // 浣跨敤鍙傛暟鍖栨煡璇㈡墽琛孲QL璇彞
- static sql::ResultSet* executeSafeQuery(sql::Connection* con, const std::string& sql, const std::vector<std::string>& params) {
- try {
- sql::PreparedStatement* pstmt = con->prepareStatement(sql);
- for (size_t i = 0; i < params.size(); ++i) {
- pstmt->setString(i + 1, params[i]);
- }
- return pstmt->executeQuery();
- } catch (sql::SQLException& e) {
- std::cerr << "鏌ヨ鎵ц閿欒: " << e.what() << std::endl;
- return nullptr;
- }
- }
-};
-
-int main() {
- sql::Connection* con = DatabaseUtils::connect();
- if (con) {
- std::string sql = "SELECT * FROM your_table WHERE column_name =?";
- std::vector<std::string> params = {"test_value"};
- if (DatabaseUtils::isSafeSQL(sql)) {
- sql::ResultSet* res = DatabaseUtils::executeSafeQuery(con, sql, params);
- if (res) {
- while (res->next()) {
- // 澶勭悊缁撴灉
- std::cout << res->getString(1) << std::endl;
- }
- delete res;
- }
- } else {
- std::cerr << "娼滃湪鐨凷QL娉ㄥ叆椋庨櫓" << std::endl;
- }
- delete con;
- }
- return 0;
-}
\ No newline at end of file
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1031 .doc" "b/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1031 .doc"
new file mode 100644
index 0000000..45c9110
--- /dev/null
+++ "b/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1031 .doc"
Binary files differ
diff --git "a/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1031.doc" "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1031.doc"
new file mode 100644
index 0000000..cfb108c
--- /dev/null
+++ "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1031.doc"
Binary files differ
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
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/20241101\346\230\206\344\273\221\346\227\245\346\212\245.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/20241101\346\230\206\344\273\221\346\227\245\346\212\245.doc"
new file mode 100644
index 0000000..27eef8f
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/log/20241101\346\230\206\344\273\221\346\227\245\346\212\245.doc"
Binary files differ
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241030.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241031.doc"
similarity index 100%
rename from "Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241030.doc"
rename to "Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241031.doc"
Binary files differ
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241101.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241101.doc"
new file mode 100644
index 0000000..75600f2
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241101.doc"
Binary files differ
diff --git a/common.h b/common.h
index a93c4bd..03aa54b 100644
--- a/common.h
+++ b/common.h
@@ -1,7 +1,7 @@
#ifndef COMMON_H
#define COMMON_H
-#include <string.h>
-#include <vector>
+
+#include <string.h>
enum TypeInfo{
@@ -13,15 +13,20 @@
RESET_REQ, //閲嶇疆瀵嗙爜璇锋眰
RESET_RES, //閲嶇疆瀵嗙爜鍝嶅簲
- //鍘嗗彶鏌ヨ鍒嗘瀽
- HISTORY_QUERY_REQ, // 鍘嗗彶鏌ヨ璇锋眰
- HISTORY_QUERY_RES, // 鍘嗗彶鏌ヨ鍝嶅簲
//鏉冮檺绠＄悊
QUERY_PMS_REQ, // 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
UPDATE_PMS_REQ, // 鎸夎鑹瞚d鏇存柊鏉冮檺淇℃伅璇锋眰
QUERY_PMS_RES, // 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
UPDATE_PMS_RES, // 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
+
+ //璁惧绠＄悊
+ AD_Req,//娣诲姞璁惧璇锋眰
+ AD_Res,//娣诲姞璁惧鍝嶅簲
+ CD_Req,//鍏抽棴璁惧璇锋眰
+ CD_Res,//鍏抽棴璁惧璇锋眰
+ PD_Req,//鏆傚仠璁惧璇锋眰
+ PD_Res,//鏆傚仠璁惧璇锋眰
//鍦板浘鏍囨敞
MAPMARK_REQ,//鍦板浘鏍囨敞璇锋眰
@@ -39,34 +44,45 @@
YIELD_REQ,//鐓ょ熆浜ч噺璇锋眰
YIELD_RES,//鐓ょ熆浜ч噺鍝嶅簲
- //鐢熶骇璁″垝绠＄悊
- ADDPRODUCTIONPLAN_REQ,//娣诲姞涓�琛屾暟鎹殑璇锋眰缁撴瀯浣�
- ADDPRODUCTIONPLAN_RES,//娣诲姞涓�琛屾暟鎹殑鍝嶅簲缁撴瀯浣�
- UPDATEPRODUCTIONPLANQUANTITY_REQ,// 鏇存柊鐢熶骇璁″垝锛堣鍒掔敓浜ч噺锛夌殑璇锋眰缁撴瀯浣�
- UPDATEPRODUCTIONPLANQUANTITY_RES,// 鏇存柊鐢熶骇璁″垝锛堣鍒掔敓浜ч噺锛夌殑鍝嶅簲缁撴瀯浣�
- UPDATEPRODUCTIONPLANLOG_REQ,//鏇存柊鐢熶骇璁″垝锛堟棩蹇楋級鐨勮姹傜粨鏋勪綋
- UPDATEPRODUCTIONPLANLOG_RES,//鏇存柊鐢熶骇璁″垝锛堟棩蹇楋級鐨勫搷搴旂粨鏋勪綋
- PRODUCTIONPLAN_REQ,// 鏌ヨ鐢熶骇璁″垝淇℃伅鐨勮姹傜粨鏋勪綋
- PRODUCTIONPLAN_RES,// 鏌ヨ鐢熶骇璁″垝淇℃伅鐨勫搷搴旂粨鏋勪綋
- FORRECENTFOURTEENPRODUCTIONPLANS_REQ,//鏌ヨ杩戝崄鍥涙潯鐨勮姹傜粨鏋勪綋
- FORRECENTFOURTEENPRODUCTIONPLANS_RES //鏌ヨ杩戝崄鍥涙潯鐨勫搷搴旂粨鏋勪綋
+ //璀︽姤绠＄悊
+ WARNING_REQ, // 璀︽姤璇锋眰
+ WARNING_RES, // 璀︽姤鍝嶅簲
- //鑷姩鍗囩骇&鐗堟湰绠＄悊
- VERSIONNUM_REQ, // 鐗堟湰鍙疯姹�
- VERSIONNUM_RES, // 鐗堟湰鍙峰搷搴�
+
+ //鐢熶骇璁″垝绠＄悊
+ ADD_PRODUCTION_PLAN_REQ,//娣诲姞涓�琛屾暟鎹殑璇锋眰缁撴瀯浣�
+ ADD_PRODUCTION_PLAN_RES,//娣诲姞涓�琛屾暟鎹殑鍝嶅簲缁撴瀯浣�
+ UPDATE_PRODUCTION_PLAN_QUANTITY_REQ,// 鏇存柊鐢熶骇璁″垝锛堣鍒掔敓浜ч噺锛夌殑璇锋眰缁撴瀯浣�
+ UPDATE_PRODUCTION_PLAN_QUANTITY_RES,// 鏇存柊鐢熶骇璁″垝锛堣鍒掔敓浜ч噺锛夌殑鍝嶅簲缁撴瀯浣�
+ UPDATE_PRODUCTION_PLAN_LOG_REQ,//鏇存柊鐢熶骇璁″垝锛堟棩蹇楋級鐨勮姹傜粨鏋勪綋
+ UPDATE_PRODUCTION_PLAN_LOG_RES,//鏇存柊鐢熶骇璁″垝锛堟棩蹇楋級鐨勫搷搴旂粨鏋勪綋
+ PRODUCTION_PLAN_REQ,// 鏌ヨ鐢熶骇璁″垝淇℃伅鐨勮姹傜粨鏋勪綋
+ PRODUCTION_PLAN_RES,// 鏌ヨ鐢熶骇璁″垝淇℃伅鐨勫搷搴旂粨鏋勪綋
+ FORRECENT_FOURTEEN_PRODUCTION_PLANS_REQ,//鏌ヨ杩戝崄鍥涙潯鐨勮姹傜粨鏋勪綋
+ FORRECENT_FOURTEEN_PRODUCTION_PLANS_RES //鏌ヨ杩戝崄鍥涙潯鐨勫搷搴旂粨鏋勪綋
+
+
+ //鍘嗗彶鏌ヨ鍒嗘瀽
+ HISTORY_QUERY_REQ, // 鍘嗗彶鏌ヨ璇锋眰
+ HISTORY_QUERY_RES, // 鍘嗗彶鏌ヨ鍝嶅簲
+
+ //鑷姩鍗囩骇
+ VERSION_NUM_REQ, // 鐗堟湰鍙疯姹�
+ VERSION_NUM_RES, // 鐗堟湰鍙峰搷搴�
UPLOAD_FILE_REQ, // 涓婁紶鏂囦欢鐨勮姹�
UPLOAD_FILE_RES, // 涓婁紶鏂囦欢鐨勫搷搴�
- VERSIONINFOENTRY_REQ, // 鐗堟湰淇℃伅褰曞叆璇锋眰
- VERSIONINFOENTRY_RES, //鐗堟湰淇℃伅褰曞叆鍝嶅簲
- VERSIONUPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
- VERSIONUPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
- FILEDOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
- FILEDOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
- DOWNLOADSUCCESSFULLY_RES // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
+ VERSION_INFOENTRY_REQ, // 鐗堟湰淇℃伅褰曞叆璇锋眰
+ VERSION_INFOENTRY_RES, //鐗堟湰淇℃伅褰曞叆鍝嶅簲
+ VERSION_UPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
+ VERSION_UPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
+ FILE_DOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
+ FILE_DOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
+ DOWNLOAD_SUCCESSFULLY_RES // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
//鏃ュ織
LOGSEARCH_REQ;//鏃ュ織鏌ヨ璇锋眰
LOGSEARCH_RES;//鏃ュ織鏌ヨ鍝嶅簲
+
};
@@ -75,6 +91,7 @@
int len;
};
+//娉ㄥ唽鐧诲綍
//鐧诲綍璇锋眰
struct LoginReq
{
@@ -170,42 +187,7 @@
};
-// 鍘嗗彶鏌ヨ璇锋眰缁撴瀯浣�
-struct HistoryQueryReq {
- Head head;
- //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
- char start_time[32];
- char end_time[32];
-
- HistoryQueryReq() {
- // 鍒濆鍖栨暟鎹ご
- head.type = HISTORY_QUERY_REQ;
- head.len = sizeof(HistoryQueryReq);
- // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
- std::memset(start_time, 0, sizeof(start_time));
- std::memset(end_time, 0, sizeof(end_time));
- }
-};
-
-
-// 鍘嗗彶鏌ヨ鍝嶅簲缁撴瀯浣�
-struct HistoryQueryRes {
- Head head;
-
- char results[1024][32];
- int result_count;
-
- HistoryQueryRes() {
- // 鍒濆鍖栨暟鎹ご
- head.type = HISTORY_QUERY_RES;
- head.len = sizeof(HistoryQueryRes);
- // 鍒濆鍖栫粨鏋滅浉鍏冲瓧娈�
- result_count = 0;
- std::memset(results, 0, sizeof(results));
- }
-};
-
-
+//鏉冮檺绠＄悊
// 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
typedef struct QueryPmsRequest{
Head head;
@@ -214,9 +196,9 @@
char permissonType[32];
QueryPmsRequest(){
head.type=QUERY_PMS_REQ;
- userNo[32] = {0};
- name[32] = {0};
- permissonType[32] = {0};
+ memset(userNo,0,32);
+ memset(permissonType,0,32);
+ memset(name,0,32);
head.len = sizeof(QueryPmsRequest);
}
} QueryPmsRequest;
@@ -237,8 +219,7 @@
} UpdatePmsRequest;
// 鍗曚釜浜哄憳鏉冮檺缁撴瀯浣�
-typedef struct UserAboutPms{
-
+typedef struct PmsRes{
int queryHistory;
int loggerSearch;
int mapMark;
@@ -250,22 +231,20 @@
char permissonType[32];
char startDateTime[32];
char endDateTime[32];
-
} PmsRes;
// 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
-typedef struct UserAboutPmsResponse{
+typedef struct QueryPmsResponse{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
- PmsRes pmsList[100];
- UserAboutPmsResponse(){
+ char pmsList[0];
+ QueryPmsResponse(){
head.type=QUERY_PMS_RES;
- head.len = sizeof(UserAboutPmsResponse);
}
} QueryPmsResponse;
// 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
-typedef struct UpdatePmsResponse{
+struct UpdatePmsResponse{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
UpdatePmsResponse(){
@@ -275,13 +254,122 @@
} UpdatePmsResponse ;
-//鍦板浘鏍囨敞璇锋眰
+
+//璁惧绠＄悊
+//娣诲姞璁惧
+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 Manufacturer[100];
+ char Devices_Type[32];
+ double Longitude;
+ double Latitude;
+};
+struct ADRes
+{
+ Head head;
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+ double Longitude;
+ double Latitude;
+ ADPermission per;
+ ADRes() {
+ head.type = AD_Res;
+ head.len = sizeof(ADRes);
+ }
+
+};
+
+//鍏抽棴璁惧
+struct CDReq
+{
+ Head head;
+ char Device_Name[32];
+ CDReq() {
+ head.type = CD_Req;
+ head.len = sizeof(CDReq);
+ }
+};
+struct CDPermission
+{
+ char Device_Name[32];
+ char Device_Status[32];
+ char Start_Time[32];
+ char Work_Time[32];
+ char Manufacturer[100];
+ char Devices_Type[32];
+ double Longitude;
+ double Latitude;
+};
+struct CDRes
+{
+ Head head;
+ char Device_Status[32];
+ int status;
+ CDPermission per;
+ CDRes() {
+ head.type = CD_Res;
+ head.len = sizeof(CDRes);
+ }
+};
+
+//鏆傚仠璁惧
+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];
+ double Longitude;
+ double Latitude;
+};
+struct PDRes
+{
+ Head head;
+ char Device_Status[32];
+ char Work_Time[32];
+ int status;
+ PDPermission per;
+ PDRes() {
+ head.type = PD_Res;
+ head.len = sizeof(PDRes);
+ }
+};
+
+
+//鍦板浘鏍囨敞
struct MapMarkReq
{
Head head;
- int marktype;//鎻掑叆銆佸垹闄ゃ��
- char msg[0];//鏌旀�ф暟缁�
- LoginReq(){
+ int marktype;//鎻掑叆銆佸垹闄ゃ�佸姞杞�
+ MaskInfo msg[0];//鏌旀�ф暟缁�
+ MapMarkReq(){
head.type = MAPMARK_REQ;
head.len = sizeof(MapMarkReq);
}
@@ -290,18 +378,18 @@
//鍦板浘鍝嶅簲锛�
struct MarkInfo
{
- int mark_id;//鏍囨敞鐐筰d
- string latitude;//绾害
- string longitude;//缁忓害
- int device_id;//璁惧ID
- int device_status;//璁惧鐘舵��
- string device_name;//璁惧鍚嶇О
+ int markId;//鏍囨敞鐐筰d
+ double latitude;//绾害
+ double longitude;//缁忓害
+ int deviceId;//璁惧ID
+ int deviceStatus;//璁惧鐘舵��
+ char deviceName[32];//璁惧鍚嶇О
};
-struct MapMarkRes ////鍦板浘鏍囨敞鍝嶅簲
+struct MapMarkRes
{
Head head;
- int marktype;//鎻掑叆杩樻槸鍒犻櫎
+ int markType;//鎻掑叆杩樻槸鍒犻櫎
int status; // 鎿嶄綔鐘舵�乢鎴愬姛/澶辫触
MaskInfo info[0];//鏌旀�ф暟缁�
MapMarkRes()
@@ -311,7 +399,7 @@
};
};
-
+//澶у睆鏄剧ず
//鐜鏁版嵁璇锋眰
struct EnvironmentReq
{
@@ -342,7 +430,7 @@
{
Head head;
char user_Name;//鎿嶄綔鐢ㄦ埛鍚�
- char alarm_Time[32];//鎿嶄綔鏃堕棿
+ char operate_Time[32];//鎿嶄綔鏃堕棿
char device_Name[32];//鎿嶄綔璁惧
char movement[256];//鎿嶄綔鎻忚堪
MovementRecordReq(){
@@ -374,6 +462,36 @@
}
};
+//璀︽姤绠＄悊
+// 璀︽姤璇锋眰缁撴瀯浣�
+struct WarningReq {
+ Head head;
+ float oxygen; // 姘ф皵娴撳害
+ float carbon; // 涓�姘у寲纰虫祿搴�
+ float temp; // 娓╁害
+ float humidity; // 婀垮害
+
+ WarningReq() {
+ head.type = WARNING_REQ;
+ head.len = sizeof(WarningReq);
+ }
+};
+
+// 璀︽姤鍝嶅簲缁撴瀯浣�
+struct WarningRes {
+ Head head;
+ int status; // 鍝嶅簲鐘舵�侊紙姣斿 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触绛夛級
+ const char* message; // 鍝嶅簲娑堟伅鎻忚堪
+
+ WarningRes(int stat, const char* msg) {
+ head.type = WARNING_RES;
+ head.len = sizeof(WarningRes);
+ status = stat;
+ message = msg;
+ }
+};
+
+//鐢熶骇璁″垝绠＄悊
//娣诲姞涓�琛屾暟鎹殑璇锋眰缁撴瀯浣�
struct AddProductionPlanReq {
Head head;
@@ -384,7 +502,7 @@
int predictedProductionQuantity;
char logText[256];
AddProductionPlanReq() {
- head.type = ADDPRODUCTIONPLAN_REQ;
+ head.type = ADD_PRODUCTION_PLAN_REQ;
head.len = sizeof(AddProductionPlanReq);
}
};
@@ -394,7 +512,7 @@
int type;
int status; // 鍙互琛ㄧず娣诲姞鏄惁鎴愬姛锛� 0 琛ㄧず澶辫触锛�1 琛ㄧず鎴愬姛
AddProductionPlanRes() {
- head.type = ADDPRODUCTIONPLAN_RES;
+ head.type = ADD_PRODUCTION_PLAN_RES;
head.len = sizeof(AddProductionPlanRes);
}
};
@@ -406,7 +524,7 @@
int plannedProductionQuantity;
char productionDate[32];
UpdateProductionPlanQuantityReq() {
- head.type = UPDATEPRODUCTIONPLANQUANTITY_REQ;
+ head.type = UPDATE_PRODUCTION_PLAN_QUANTITY_REQ;
head.len = sizeof(UpdateProductionPlanQuantityReq);
}
};
@@ -416,7 +534,7 @@
int type;
int status; // 鍙互琛ㄧず鏇存柊鏄惁鎴愬姛锛屼緥濡� 0 琛ㄧず澶辫触锛�1 琛ㄧず鎴愬姛
UpdateProductionPlanQuantityRes() {
- head.type = UPDATEPRODUCTIONPLANQUANTITY_RES;
+ head.type = UPDATE_PRODUCTION_PLAN_QUANTITY_RES;
head.len = sizeof(UpdateProductionPlanQuantityRes);
}
};
@@ -429,7 +547,7 @@
char logText[256];
char productionDate[32];
UpdateProductionPlanLogReq() {
- head.type = UPDATEPRODUCTIONPLANLOG_REQ;
+ head.type = UPDATE_PRODUCTION_PLAN_LOG_REQ;
head.len = sizeof(UpdateProductionPlanLogReq);
}
};
@@ -439,7 +557,7 @@
int type;
int status; // 鍙互琛ㄧず鏇存柊鏄惁鎴愬姛锛屼緥濡� 0 琛ㄧず澶辫触锛�1 琛ㄧず鎴愬姛
UpdateProductionPlanLogRes() {
- head.type = UPDATEPRODUCTIONPLANLOG_RES;
+ head.type = UPDATE_PRODUCTION_PLAN_LOG_RES;
head.len = sizeof(UpdateProductionPlanLogRes);
}
};
@@ -457,7 +575,7 @@
int predictedProductionQuantity;
char logText[256];
ProductionPlanReq() {
- head.type = PRODUCTIONPLAN_REQ;
+ head.type = PRODUCTION_PLAN_REQ;
head.len = sizeof(ProductionPlanReq);
}
};
@@ -473,7 +591,7 @@
char productionDate[32];
char logText[256];
ProductionPlanRes() {
- head.type = PRODUCTIONPLAN_REQ;
+ head.type = PRODUCTION_PLAN_REQ;
head.len = sizeof(ProductionPlanRes);
}
};
@@ -501,18 +619,75 @@
char productionDates[14][32];
char logTexts[14][256];
RecentFourteenProductionPlansRes() {
- head.type = UPDATEPRODUCTIONPLANQUANTITY_REQ;
+ head.type = UPDATE_PRODUCTION_PLAN_QUANTITY_REQ;
head.len = sizeof(RecentFourteenProductionPlansRes);
}
};
+//鍘嗗彶鏌ヨ鍒嗘瀽
+// 鍘嗗彶鏌ヨ璇锋眰缁撴瀯浣�
+struct HistoryQueryReq {
+ Head head;
+ //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
+ char start_time[32];
+ char end_time[32];
+
+ HistoryQueryReq() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_QUERY_REQ;
+ head.len = sizeof(HistoryQueryReq);
+ // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
+ std::memset(start_time, 0, sizeof(start_time));
+ std::memset(end_time, 0, sizeof(end_time));
+ }
+};
+
+// 绯荤粺杩愯鐘舵�佽〃鐩稿叧淇℃伅
+struct Histroy_Info{
+ int sysId; // 瀵瑰簲绯荤粺杩愯鐘舵�佽〃鐨勮褰曠紪鍙�
+ char sysDataCollectionTime[50]; // 鏁版嵁閲囬泦鏃堕棿
+ char sysDeviceType[50]; // 璁惧绫诲瀷
+ char sysDeviceId[50]; // 璁惧缂栧彿
+ char sysDeviceStatus[50]; // 璁惧鐘舵��
+ char sysSystemStatus[50]; // 绯荤粺鏁翠綋杩愯鐘舵�佹弿杩�
+
+ int devId; // 瀵瑰簲璁惧璇︾粏淇℃伅琛ㄧ殑璁板綍缂栧彿
+ char devDeviceType[50]; // 璁惧绫诲瀷锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧绫诲瀷瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
+ char devDeviceId[50]; // 璁惧缂栧彿锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧缂栧彿瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
+ char devModel[50]; // 璁惧鍨嬪彿
+ char runDeviceStatus[50]; // 璁惧鐘舵��
+ char runFaultAlarmTime[50]; // 鏁呴殰鎶ヨ鏃堕棿
+ char runFaultDescription[50]; // 鏁呴殰璇︾粏鎻忚堪
+
+ int safetyId; // 瀵瑰簲璁惧瀹夊叏鐘舵�佽〃鐨勮褰曠紪鍙�
+ char safetyDataCollectionTime[50]; // 鏁版嵁閲囬泦鏃堕棿锛堝彲鐢ㄤ簬鍏宠仈涓嶅悓琛ㄥ湪鍚屼竴鏃堕棿鐐圭殑鏁版嵁鎯呭喌锛�
+ char safetyDeviceType[50]; // 璁惧绫诲瀷锛堢敤浜庡叧鑱旓級
+ char safetyDeviceId[50]; // 璁惧缂栧彿锛堢敤浜庡叧鑱旓級
+ char safetyStatus[50]; // 璁惧瀹夊叏鐘舵��
+ char safetyParameter[50]; // 瀹夊叏鍙傛暟
+};
+// 鍘嗗彶鏌ヨ鍝嶅簲缁撴瀯浣�
+// 瀹夊叏鐘舵�佽〃鐩稿叧淇℃伅
+struct HistoryQueryRes {
+ Head head;
+ Histroy_Info sys[0];
+
+ HistoryQueryRes() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_QUERY_RES;
+ head.len = sizeof(HistoryQueryRes);
+ }
+
+};
+
+//鑷姩鍗囩骇
struct VersionNumReq // 鐗堟湰鍙疯姹�
{
Head head;
VersionNumReq() {
- head.type = VERSIONNUM_REQ;
+ head.type = VERSION_NUM_REQ;
head.len = sizeof(VersionNumReq);
}
};
@@ -520,9 +695,9 @@
struct VersionNumRes // 鐗堟湰鍙峰搷搴�
{
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
VersionNumRes() {
- head.type = VERSIONNUM_RES;
+ head.type = VERSION_NUM_RES;
head.len = sizeof(VersionNumRes);
}
};
@@ -530,8 +705,8 @@
// 鏂囦欢浼犺緭
struct FileInfo
{
- char file_name[256];
- long long file_size;
+ char fileName[256];
+ long long fileSize;
char s_filepath[128];
char content[0];
};
@@ -549,7 +724,7 @@
struct UploadFileRes { // 涓婁紶鏂囦欢鐨勫搷搴�
Head head;
bool state = false;
- char file_name[256];
+ char fileName[256];
long long file_size;
UploadFileRes()
{
@@ -562,19 +737,14 @@
// 璇锋眰
struct VersionInfoEntryReq {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
- char version_id_old[64]; // 涓婁竴涓増鏈彿
- char s_filepath[16][128]; //鏈嶅姟鍣ㄦ斁鏈�鏂扮増鏈殑璺緞
- char version_description[256]; //鏇存柊鍐呭
- char version_creattime[32]; // 鏇存柊鏃堕棿
- char filename[16][128];
- long long filesize[16];
- char c_filepath[16][128];
+ char versionId[64]; // 鐗堟湰鍙�
+ char versionIdOld[64]; // 涓婁竴涓増鏈彿
+ char context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
int fileNum;
VersionInfoEntryReq()
{
- head.type = VERSIONINFOENTRY_REQ;
+ head.type = VERSION_INFOENTRY_REQ;
head.len = sizeof(VersionInfoEntryReq);
}
};
@@ -585,7 +755,7 @@
bool state = false;
VersionInfoEntryRes()
{
- head.type = VERSIONINFOENTRY_RES;
+ head.type = VERSION_INFOENTRY_RES;
head.len = sizeof(VersionInfoEntryRes);
}
};
@@ -594,10 +764,10 @@
struct VersionUpdateReq {
Head head;
- char cur_version_id[64]; // 鐗堟湰鍙�
+ char curVersionId[64]; // 鐗堟湰鍙�
VersionUpdateReq()
{
- head.type = VERSIONUPDATE_REQ;
+ head.type = VERSION_UPDATE_REQ;
head.len = sizeof(VersionUpdateReq);
}
};
@@ -606,13 +776,13 @@
struct VersionUpdateRes {
Head head;
bool state = false;
- char version_id[64]; // 鐗堟湰鍙�
- char update_date[32]; // 鏇存柊鏃堕棿
- char version_description[1024]; //鏇存柊鎻忚堪
+ char versionId[64]; // 鐗堟湰鍙�
+ char updateDate[32]; // 鏇存柊鏃堕棿
+ char versionDescription[1024]; //鏇存柊鎻忚堪
VersionUpdateRes()
{
- head.type = VERSIONUPDATE_RES;
+ head.type = VERSION_UPDATE_RES;
head.len = sizeof(VersionUpdateRes);
}
};
@@ -620,10 +790,10 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
struct FileDownloadsReq {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
FileDownloadsReq()
{
- head.type = FILEDOWNLOADS_REQ;
+ head.type = FILE_DOWNLOADS_REQ;
head.len = sizeof(FileDownloadsReq);
}
};
@@ -631,16 +801,16 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
struct FileDownloadsRes {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
char filename[128]; //鏂囦欢鍚�
long long filesize; //鏂囦欢澶у皬
char c_filepath[128]; //瀹㈡埛绔斁鏈�鏂扮増鏈殑鏈湴璺緞
int fileNum; // 鏂囦欢鏁伴噺
- long long all_fileSize; // 鏂囦欢鎬诲ぇ灏�
+ long long allFileSize; // 鏂囦欢鎬诲ぇ灏�
char content[0];
FileDownloadsRes()
{
- head.type = FILEDOWNLOADS_RES;
+ head.type = FILE_DOWNLOADS_RES;
head.len = sizeof(FileDownloadsRes);
}
};
@@ -649,66 +819,84 @@
struct DownloadSuccessfullyRes{
Head head;
bool state = false;
- char file_name[256];
- long long file_size;
+ char fileName[256];
+ long long fileSize;
DownloadSuccessfullyRes()
{
- head.type = DOWNLOADSUCCESSFULLY_RES;
+ head.type = DOWNLOAD_SUCCESSFULLY_RES;
head.len = sizeof(DownloadSuccessfullyRes);
}
};
+<<<<<<< HEAD
+//鏃ュ織鏌ヨ
-struct LogQueryRequest {
- Head header; // 鏁版嵁澶�
- std::string* keywords; // 瀛樺偍澶氫釜鍏抽敭瀛楃殑鏌旀�ф暟缁�
- size_t keywordCount; // 鍏抽敭瀛楁暟閲�
- std::string startDate; // 寮�濮嬫棩鏈� (鏍煎紡: YYYY-MM-DD)
- std::string endDate; // 缁撴潫鏃ユ湡 (鏍煎紡: YYYY-MM-DD)
- int pageNumber; // 褰撳墠椤电爜
- int pageSize; // 姣忛〉鏉＄洰鏁�
+enum Typeinfo{
+ LOGSEARCH_REQ,//鏃ュ織鏌ヨ璇锋眰
+ LOGSEARCH_RES,//鏃ュ織鏌ヨ鍝嶅簲
- // 鏋勯�犲嚱鏁�
- LogQueryRequest(int type, int len, std::string* keywords, size_t keywordCount, const std::string& startDate, const std::string& endDate, int pageNumber, int pageSize)
- : header{type, len}, keywords(keywords), keywordCount(keywordCount), startDate(startDate), endDate(endDate), pageNumber(pageNumber), pageSize(pageSize) {}
+};
- // 鏋愭瀯鍑芥暟
- ~LogQueryRequest() {
- delete[] keywords; // 閲婃斁鍔ㄦ�佸垎閰嶇殑鍐呭瓨
+struct Head
+{
+ int type; // 鍔熻兘绫诲瀷
+ int len; //灏佸寘闀垮害
+
+};
+// 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
+struct LogQueryReq {
+ Head heade; // 鏁版嵁澶�
+ char keyWords[0]; // 瀛樺偍澶氫釜鍏抽敭瀛楃殑鏌旀�ф暟缁�
+=======
+//鏃ュ織
+struct ParsedLog {
+ char timestamp[64]; // 鏃堕棿鎴�
+ char device_id[64]; // 璁惧ID
+ char level[16]; 聽 聽 // 鏃ュ織绾у埆
+ char content[256]; 聽// 鏃ュ織鍐呭
+ char source[64]; 聽 聽// 鏉ユ簮妯″潡
+ char user_id[64]; 聽 // 鐢ㄦ埛ID
+};
+
+// 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
+struct LogQueryReq {
+ Head head; // 鏁版嵁澶�
+<<<<<<< HEAD
+ char keyWords[32]; // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+=======
+ char keyWords[32]; // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
+>>>>>>> 3d2b586460830c5dbebffe49bd3d5c2477de0aee
+ // 鏃犲弬鏋勯�犲嚱鏁�
+ LogQueryReq() {
+ head.type = LOGSEARCH_REQ;
+ head.len = sizeof(LogQueryReq);
}
};
-//鏃ュ織鏌ヨ鍝嶅簲
-// 瀹氫箟鏃ュ織鏉＄洰缁撴瀯浣�
-struct LogEntry {
- int id; // 鏃ュ織鏉＄洰 ID
- string entryTime; // 涓嬩簳鏃堕棿
- string name; // 濮撳悕
- string exitTime; // 鍗囦簳鏃堕棿
- string department; // 閮ㄩ棬
- string position; // 宀椾綅
- //string workingTime; // 宸ヤ綔鏃堕棿 鏁版嵁搴撹嚜鍔ㄧ敓鎴�
-
- // 鏋勯�犲嚱鏁�
- LogEntry(int id, const string& entryTime, const string& name,
- const string& exitTime, const string& department,
- const string& position)
- : id(id), entryTime(entryTime), name(name),
- exitTime(exitTime), department(department), position(position) {}
-};
-
-// 瀹氫箟鏃ュ織鏌ヨ鍝嶅簲缁撴瀯浣�
-struct LogQueryResponse {
+// 鏃ュ織鏌ヨ鍝嶅簲缁撴瀯浣�
+struct LogQueryRes {
+<<<<<<< HEAD
+ Head heade;
+=======
+ Head head;
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
int status; // 鍝嶅簲鐘舵�� (濡� 0 琛ㄧず鎴愬姛锛岄潪 0 琛ㄧず澶辫触)
- string errorMessage; // 閿欒淇℃伅锛堝鏋滄湁锛�
- vector<LogEntry> logEntries; // 鏃ュ織鏉＄洰
-
- // 鏋勯�犲嚱鏁�
- LogQueryResponse(int status, const string& errorMessage, const vector<LogEntry>& logEntries)
- : status(status), errorMessage(errorMessage), logEntries(logEntries) {}
+ char errorMessage[256]; // 閿欒淇℃伅锛堝鏋滄湁锛�
+
+ // 鏃犲弬鏋勯�犲嚱鏁�
+ LogQueryRes() {
+ head.type = LOGSEARCH_RES;
+<<<<<<< HEAD
+ head.len = sizeof(LogQueryRes);
+=======
+ head.len = sizeof(LogQueryRes);
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
+ }
};
-#endif // COMMON_H
\ No newline at end of file
+#endif // COMMON_H
+
--
Gitblit v1.8.0