From a4170bd5a193943ad71bcc35f9e35344dbfaba96 Mon Sep 17 00:00:00 2001
From: lhl <1281544429@qq.com>
Date: 星期二, 05 十一月 2024 21:54:19 +0800
Subject: [PATCH] 修改common的设备管理结构体

---
 common.h |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/common.h b/common.h
index e52d8d8..e6d913b 100644
--- a/common.h
+++ b/common.h
@@ -276,22 +276,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 +302,7 @@
 struct ADRes//娣诲姞鍝嶅簲
 {
 	Head head;
-	int type;
+	int status;
 	ADRes() {
 		head.type = AD_RES;
 		head.len = sizeof(ADRes);
@@ -310,22 +310,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 +342,7 @@
 struct QDRes//鏌ヨ鍝嶅簲
 {
 	Head head;
-	int type;
+	int status;
 	QDRes() {
 		head.type = QD_RES;
 		head.len = sizeof(QDRes);
@@ -436,6 +437,8 @@
 //鐜鏁版嵁鍝嶅簲
 struct Environment
 {
+	double longitude;//缁忓害
+	double latitude;//绾害
 	float temp;//娓╁害
 	float humidity;//婀垮害
 	float oxygen;//姘ф皵娴撳害
@@ -463,6 +466,8 @@
 //璁惧鐘舵�佸搷搴�
 struct DeviceStatus
 {
+	double longitude;//缁忓害
+	double latitude;//绾害
 	int deviceID;//璁惧缂栧彿
 	char deviceName[32];//璁惧鍚嶇О
 	char deviceStatus[32];//璁惧鐘舵��
@@ -489,6 +494,8 @@
 //鎿嶄綔鏃ュ織鍝嶅簲
 struct MovementRecord
 {
+	double longitude;//缁忓害
+	double latitude;//绾害
 	char userName;//鎿嶄綔鐢ㄦ埛鍚�
 	char operateTime[32];//鎿嶄綔鏃堕棿
 	char deviceName[32];//鎿嶄綔璁惧
@@ -516,8 +523,10 @@
 //璀︽姤璁板綍鍝嶅簲
 struct AlarmRecord
 {
+	double longitude;//缁忓害
+	double latitude;//绾害
 	char alarmTime[32];//璀︽姤鏃堕棿
-	char alarmtype[32];//閫氱煡鏃堕棿
+	char alarmtype[32];//澶勭悊鏃堕棿
 	char alarmContent[256];//璀︽姤鍐呭
 };
 struct AlarmRecordRes

--
Gitblit v1.8.0