From a2a845c7ca4ba4aa08fde7f63d5b24975bcd294c Mon Sep 17 00:00:00 2001
From: 小驴在此and <2154553021@qq.com>
Date: 星期四, 07 十一月 2024 15:09:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 275 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 198 insertions(+), 77 deletions(-)
diff --git a/common.h b/common.h
index e52d8d8..bb0a5f2 100644
--- a/common.h
+++ b/common.h
@@ -50,7 +50,11 @@
//璀︽姤绠＄悊
WARNING_REQ, // 璀︽姤璇锋眰
- WARNING_RES, // 璀︽姤鍝嶅簲
+ WARNING_RES, // 璀︽姤鍝嶅簲
+ DATA_REQ, // 鏁版嵁璇锋眰
+ DATA_RES, // 鏁版嵁鍝嶅簲
+ THRESHOLD_REQ, //闃堝�艰姹�
+ THRESHOLD_RES, //闃堝�煎搷搴�
//鐢熶骇璁″垝绠＄悊
@@ -90,6 +94,14 @@
//鏃ュ織
LOGSEARCH_REQ,//鏃ュ織鏌ヨ璇锋眰
LOGSEARCH_RES,//鏃ュ織鏌ヨ鍝嶅簲
+
+ //鍘嗗彶鏌ヨ鍒嗘瀽
+ HISTORY_DEV_REQ, //鍘嗗彶鏌ヨ纭欢璇锋眰
+ HISTORY_DEV_RES, //鍘嗗彶鏌ヨ纭欢鍝嶅簲
+ HISTORY_PRODUCE_REQ, //鍘嗗彶鏌ヨ鐢熶骇璇锋眰
+ HISTORY_PRODUCE_RES, //鍘嗗彶鏌ヨ鐢熶骇鍝嶅簲
+ HISTORY_ENV_REQ, //鍘嗗彶鏌ヨ鐜璇锋眰
+ HISTORY_ENV_RES, //鍘嗗彶鏌ヨ鐜鍝嶅簲
};
@@ -276,22 +288,22 @@
//璁惧绠＄悊
struct DevicesInfo
{
- int deviceID;
char deviceName[32];//璁惧鍚嶇О
char deviceStatus[32];//璁惧鐘舵��
+ char area[32]; // 鍦板尯
+ double longitude;//缁忓害
+ double latitude;//绾害
+ char purchasingTime[15];//璐拱鏃堕棿
+ char installTime[15];//瀹夎鏃堕棿
char manufacturer[100];//鍘傚
+ char devicesSerialNumber[32];//璁惧缂栫爜
char devicesType[32];//璁惧绫诲瀷
- double longitude;//缁忓害
- double latitude;//绾害
- char purchasingTime[15];//璐拱鏃堕棿
- char installTime[15];//瀹夎鏃堕棿
- char devicesSerialNumber[32];//璁惧缂栫爜
};
//娣诲姞璁惧
struct ADReq//娣诲姞璇锋眰
{
Head head;
- char deviceName[32];
+ DevicesInfo devInfo[0];
ADReq() {
head.type = AD_REQ;
head.len = sizeof(ADReq);
@@ -302,7 +314,7 @@
struct ADRes//娣诲姞鍝嶅簲
{
Head head;
- int type;
+ int status;
ADRes() {
head.type = AD_RES;
head.len = sizeof(ADRes);
@@ -310,22 +322,23 @@
};
//淇敼璁惧
-struct MDRes//淇敼璇锋眰
+struct MDReq//淇敼璇锋眰
{
Head head;
DevicesInfo info;
- MDRes() {
- head.type = MD_RES;
- head.len = sizeof(MDRes);
- }
-};
-struct MDReq//淇敼鍝嶅簲
-{
- Head head;
- int type;
MDReq() {
head.type = MD_REQ;
head.len = sizeof(MDReq);
+ }
+};
+struct MDRes//淇敼鍝嶅簲
+{
+ Head head;
+ DevicesInfo info;
+ int status;
+ MDRes() {
+ head.type = MD_RES;
+ head.len = sizeof(MDRes);
}
};
//鏌ヨ璁惧
@@ -341,7 +354,8 @@
struct QDRes//鏌ヨ鍝嶅簲
{
Head head;
- int type;
+ int status;
+ DevicesInfo info[0];
QDRes() {
head.type = QD_RES;
head.len = sizeof(QDRes);
@@ -436,6 +450,8 @@
//鐜鏁版嵁鍝嶅簲
struct Environment
{
+ double longitude;//缁忓害
+ double latitude;//绾害
float temp;//娓╁害
float humidity;//婀垮害
float oxygen;//姘ф皵娴撳害
@@ -463,6 +479,8 @@
//璁惧鐘舵�佸搷搴�
struct DeviceStatus
{
+ double longitude;//缁忓害
+ double latitude;//绾害
int deviceID;//璁惧缂栧彿
char deviceName[32];//璁惧鍚嶇О
char deviceStatus[32];//璁惧鐘舵��
@@ -489,6 +507,8 @@
//鎿嶄綔鏃ュ織鍝嶅簲
struct MovementRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char userName;//鎿嶄綔鐢ㄦ埛鍚�
char operateTime[32];//鎿嶄綔鏃堕棿
char deviceName[32];//鎿嶄綔璁惧
@@ -516,8 +536,10 @@
//璀︽姤璁板綍鍝嶅簲
struct AlarmRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char alarmTime[32];//璀︽姤鏃堕棿
- char alarmtype[32];//閫氱煡鏃堕棿
+ char alarmtype[32];//澶勭悊鏃堕棿
char alarmContent[256];//璀︽姤鍐呭
};
struct AlarmRecordRes
@@ -557,50 +579,98 @@
};
//璀︽姤绠＄悊
-// 璀︽姤璇锋眰缁撴瀯浣�
+struct warningInfo {
+ char device_name[32];//璁惧鍚嶇О
+ char des[32];//璀︽姤鎻忚堪
+ char time[32];//璀︽姤鏃堕棿
+ float warningdata;//璀︽姤鏁版嵁
+ char type[16];//璀︽姤绫诲瀷
+ char status[16];//璀︽姤鐘舵��
+};
+
+struct dataInfo {
+ char device_name[32];
+ char type[16];//鐜鏁版嵁绫诲瀷
+ float data;
+ char time[32];//涓婁紶鏁版嵁鏃堕棿
+};
+
+struct threshInfo {
+ char device_name[32];
+ char type[16];//鐜绫诲瀷
+ float min;//鏈�灏忛槇鍊�
+ float max;//鏈�澶ч槇鍊�
+ char time[32];//闃堝�间慨鏀规椂闂�
+};
+
+//璀︽姤璇锋眰缁撴瀯浣�
struct WarningReq {
- Head head;
+ Head head;
+ warningInfo info[0];
- float oxygenWarning;
- float carbonWarning;
- float tempWarning;
- float humidityWarning;
+ WarningReq() {
+ head.type = WARNING_REQ;
+ head.len = sizeof(WarningReq);
+ }
+};
- WarningReq() {
- head.type = WARNING_REQ;
- head.len = sizeof(WarningReq);
- }
+//鏁版嵁璇锋眰缁撴瀯浣�
+struct DataReq {
+ Head head;
+ dataInfo Info[0];
+
+ DataReq() {
+ head.type = DATA_REQ;
+ head.len = sizeof(DataReq);
+ }
+};
+
+//闃堝�艰姹傜粨鏋勪綋
+struct ThresholdReq {
+ Head head;
+ threshInfo threInfo[0];
+
+ ThresholdReq() {
+ head.type = THRESHOLD_REQ;
+ head.len = sizeof(ThresholdReq);
+ }
};
-struct DataThreshold {
- //闃堝��
- float oxygenThreshold;
- float carbonThreshold;
- float tempThreshold;
- float humidityThreshold;
-};
-
-struct Data {
- float oxygen; // 姘ф皵娴撳害
- float carbon; // 涓�姘у寲纰虫祿搴�
- float temp; // 娓╁害
- float humidity; // 婀垮害
-};
-
-// 璀︽姤鍝嶅簲缁撴瀯浣�
+//璀︽姤鍝嶅簲缁撴瀯浣�
struct WarningRes {
- Head head;
- int status; // 鍝嶅簲鐘舵�侊紙姣斿 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触绛夛級
- const char* message; // 鍝嶅簲娑堟伅鎻忚堪
+ Head head;
+ int status;// 鍝嶅簲鐘舵��
+ warningInfo warninginfo[0];
- WarningRes(int stat, const char* msg) {
- head.type = WARNING_RES;
- head.len = sizeof(WarningRes);
- status = stat;
- message = msg;
- }
+ WarningRes() {
+ head.type = WARNING_RES;
+ head.len = sizeof(WarningRes);
+ }
};
+
+struct DataRes {
+ Head head;
+ int status;// 鍝嶅簲鐘舵��
+ dataInfo datainfo[0];
+
+ DataRes() {
+ head.type = DATA_RES;
+ head.len = sizeof(DataRes);
+ }
+};
+
+struct ThresholdRes {
+ Head head;
+ int status;// 鍝嶅簲鐘舵��
+ threshInfo threInfo[0];
+
+ ThresholdRes() {
+ head.type = THRESHOLD_RES;
+ head.len = sizeof(ThresholdRes);
+ }
+};
+
//鐢熶骇璁″垝绠＄悊
struct PdplanInfo
@@ -819,40 +889,91 @@
//鍘嗗彶鏌ヨ鍒嗘瀽
-// 鍘嗗彶鏌ヨ璇锋眰缁撴瀯浣�
-struct HistoryQueryReq {
+
+//鍘嗗彶鏌ヨ鍒嗘瀽
+
+struct warningInfo {
+ int device_id;
+ char des[32];
+ char time[32];
+ float data;
+ char type[16];
+ char status[16];
+};
+// 鍘嗗彶鏌ヨ璁惧淇℃伅璇锋眰缁撴瀯浣�
+struct HistoryDevReq {
Head head;
//鏍规嵁鏃堕棿鑼冨洿鏌ヨ
char startTime[32];
char endTime[32];
//鍏抽敭瀛楁煡璇�
char keyWord[32];
- HistoryQueryReq() {
+ HistoryDevReq() {
// 鍒濆鍖栨暟鎹ご
- head.type = QUERY_MONOUTPUT_REQ;
- head.len = sizeof(HistoryQueryReq);
+ head.type = HISTORY_DEV_REQ;
+ head.len = sizeof(HISTORY_DEV_REQ);
// 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
- std::memset(startTime, 0, sizeof(startTime));
- std::memset(endTime, 0, sizeof(endTime));
-
+ }
+};
+// 鍘嗗彶鏌ヨ鐢熶骇璁″垝璇锋眰缁撴瀯浣�
+struct HistoryProReq {
+ Head head;
+ //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
+ char startTime[32];
+ char endTime[32];
+ //鍏抽敭瀛楁煡璇�
+ char keyWord[32];
+ HistoryProReq() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_PRODUCE_REQ;
+ head.len = sizeof(HistoryProReq);
+ // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
+ }
+};
+// 鍘嗗彶鏌ヨ鐜淇℃伅璇锋眰缁撴瀯浣�
+struct HistoryEnvReq {
+ Head head;
+ //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
+ char startTime[32];
+ char endTime[32];
+ //鍏抽敭瀛楁煡璇�
+ char keyWord[32];
+ HistoryEnvReq() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_ENV_REQ;
+ head.len = sizeof(HistoryEnvReq);
+ // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
}
};
-// 鍘嗗彶鏌ヨ鍝嶅簲缁撴瀯浣�
-
-// 绯荤粺杩愯鐘舵�佽〃鐩稿叧淇℃伅
-struct HistroyInfo {
- WarningRes warn;//璀︽姤鏌ヨ
- QDRes dev;//璁惧鏌ヨ
- QueryPdplanRes pro;//鐢熶骇璁″垝鏌ヨ
-};
-struct HistoryQueryRes {
+//鏌ヨ璁惧淇℃伅鍝嶅簲缁撴瀯浣�
+struct HistoryDevRes {
Head head;
- HistroyInfo sys[0];
- HistoryQueryRes() {
+ DevicesInfo dev[0];
+ HistoryDevRes() {
// 鍒濆鍖栨暟鎹ご
- head.type = QUERY_MONOUTPUT_RES;
- head.len = sizeof(HistoryQueryRes);
+ head.type = HISTORY_DEV_RES;
+ head.len = sizeof(HistoryDevRes);
+ }
+};
+//鏌ヨ鐢熶骇璁″垝鍝嶅簲缁撴瀯浣�
+struct HistoryProRes {
+ Head head;
+ PdplanInfo pro[0];
+ HistoryProRes() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_PRODUCE_RES;
+ head.len = sizeof(HistoryProRes);
+ }
+};
+//鏌ヨ鐜淇℃伅鍝嶅簲缁撴瀯浣�
+struct HistoryEnvRes {
+ Head head;
+ warningInfo env[0];
+ HistoryEnvRes() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = HISTORY_ENV_RES;
+ head.len = sizeof(HistoryEnvRes);
}
};
--
Gitblit v1.8.0