From 178b49292365dda90cc91d9547e97a5eb43006df Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期六, 02 十一月 2024 12:23:29 +0800
Subject: [PATCH] 提交
---
common.h | 451 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 325 insertions(+), 126 deletions(-)
diff --git a/common.h b/common.h
index 5693dd0..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,15 +819,16 @@
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
//鏃ュ織鏌ヨ
enum Typeinfo{
@@ -676,6 +847,26 @@
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;
@@ -685,14 +876,22 @@
// 鏃ュ織鏌ヨ鍝嶅簲缁撴瀯浣�
struct LogQueryRes {
+<<<<<<< HEAD
Head heade;
+=======
+ Head head;
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
int status; // 鍝嶅簲鐘舵�� (濡� 0 琛ㄧず鎴愬姛锛岄潪 0 琛ㄧず澶辫触)
char errorMessage[256]; // 閿欒淇℃伅锛堝鏋滄湁锛�
// 鏃犲弬鏋勯�犲嚱鏁�
LogQueryRes() {
head.type = LOGSEARCH_RES;
+<<<<<<< HEAD
head.len = sizeof(LogQueryRes);
+=======
+ head.len = sizeof(LogQueryRes);
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
}
};
--
Gitblit v1.8.0