From 04b7ab4a31806726ac4b19ee93d31aa8084768ea Mon Sep 17 00:00:00 2001
From: lhl <1281544429@qq.com>
Date: 星期六, 02 十一月 2024 12:25:41 +0800
Subject: [PATCH] 提交日志
---
Client/黎弘霖/log/设备管理_黎弘霖_1102.doc | 0
Client/黎弘霖/code/Devices_Management_Struct.h | 131 ++++++++++++++++---------------------------
2 files changed, 49 insertions(+), 82 deletions(-)
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 67b38a2..28278eb 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"
@@ -1,121 +1,88 @@
#pragma once
enum TypeInfo
{
- AD_Req,//添加设备请求
- AD_Res,//添加设备响应
- CD_Req,//关闭设备请求
- CD_Res,//关闭设备请求
- PD_Req,//暂停设备请求
- PD_Res,//暂停设备请求
+ AD_REQ,//添加设备请求
+ AD_RES,//添加设备响应
+ MD_REQ,//修改设备请求
+ MD_RES,//修改设备响应
+ QD_REQ,//查询设备请求
+ QD_RES,//查询设备响应
};
struct Head
{
int type;
int len;
};
-
+struct DevicesInfo
+{
+ int deviceID;
+ char deviceName[32];//设备名称
+ char deviceStatus[32];//设备状态
+ char manufacturer[100];//厂家
+ char devicesType[32];//设备类型
+ double longitude;//经度
+ double latitude;//纬度
+ char purchasingTime[15];//购买时间
+ char installTime[15];//安装时间
+ char devicesSerialNumber[32];//设备编码
+};
//添加设备
-struct ADReq
+struct ADReq//添加请求
{
Head head;
- char Device_Name[32];
+ char deviceName[32];
ADReq() {
- head.type = AD_Req;
- head.len = sizeof(AD_Req);
+ head.type = AD_REQ;
+ head.len = sizeof(ADReq);
}
};
-struct ADPermission
-{
- char Device_Name[32];
- char Device_Status[32];
- char Manufacturer[100];
- char Devices_Type[32];
- double Longitude;
- double Latitude;
-};
-struct ADRes
+
+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;
+ int type;
ADRes() {
- head.type = AD_Res;
+ head.type = AD_RES;
head.len = sizeof(ADRes);
}
};
-
-//关闭设备
-struct CDReq
+//修改设备
+struct MDRes//修改请求
{
Head head;
- char Device_Name[32];
- CDReq() {
- head.type = CD_Req;
- head.len = sizeof(CDReq);
+ DevicesInfo info;
+ MDRes() {
+ head.type = MD_RES;
+ head.len = sizeof(MDRes);
}
};
-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
+struct MDReq//修改响应
{
Head head;
- char Device_Status[32];
- int status;
- CDPermission per;
- CDRes() {
- head.type = CD_Res;
- head.len = sizeof(CDRes);
+ int type;
+ MDReq() {
+ head.type = MD_REQ;
+ head.len = sizeof(MDReq);
}
};
-
-//暂停设备
-struct PDReq
+//查询设备
+struct QDReq//查询请求
{
Head head;
- char Device_Name[32];
- PDReq() {
- head.type = PD_Req;
- head.len = sizeof(PDReq);
+ DevicesInfo info;
+ QDReq() {
+ head.type = QD_REQ;
+ head.len = sizeof(QDReq);
}
};
-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
+struct QDRes//查询响应
{
Head head;
- char Device_Status[32];
- char Work_Time[32];
- int status;
- PDPermission per;
- PDRes() {
- head.type = PD_Res;
- head.len = sizeof(PDRes);
+ int type;
+ QDRes() {
+ head.type = QD_RES;
+ head.len = sizeof(QDRes);
}
};
\ No newline at end of file
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_1102.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_1102.doc"
new file mode 100644
index 0000000..a5753d6
--- /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_1102.doc"
Binary files differ
--
Gitblit v1.8.0