From 701eb0c8a8b4c5d7b7b0c1d1e8bffd97671588b3 Mon Sep 17 00:00:00 2001
From: MYH <2395591599@qq.com>
Date: 星期五, 01 十一月 2024 17:46:14 +0800
Subject: [PATCH] 修改common
---
common.h | 93 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/common.h b/common.h
index 3fb2653..098249e 100644
--- a/common.h
+++ b/common.h
@@ -1,9 +1,7 @@
#ifndef COMMON_H
#define COMMON_H
-#include <iostream>
-#include <cstring>
-#include <QString>
+#include <string.h>
enum TypeInfo{
@@ -25,8 +23,8 @@
//璁惧绠＄悊
AD_Req,//娣诲姞璁惧璇锋眰
AD_Res,//娣诲姞璁惧鍝嶅簲
- DD_Req,//鍋滄璁惧璇锋眰
- DD_Res,//鍋滄璁惧璇锋眰
+ CD_Req,//鍏抽棴璁惧璇锋眰
+ CD_Res,//鍏抽棴璁惧璇锋眰
PD_Req,//鏆傚仠璁惧璇锋眰
PD_Res,//鏆傚仠璁惧璇锋眰
@@ -273,15 +271,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;
@@ -290,17 +295,17 @@
};
-//鍋滄璁惧
-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];
@@ -308,15 +313,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);
}
};
@@ -338,11 +346,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;
@@ -635,26 +647,26 @@
// 绯荤粺杩愯鐘舵�佽〃鐩稿叧淇℃伅
struct Histroy_Info{
int sysId; // 瀵瑰簲绯荤粺杩愯鐘舵�佽〃鐨勮褰曠紪鍙�
- QString sysDataCollectionTime; // 鏁版嵁閲囬泦鏃堕棿
- QString sysDeviceType; // 璁惧绫诲瀷
- QString sysDeviceId; // 璁惧缂栧彿
- QString sysDeviceStatus; // 璁惧鐘舵��
- QString sysSystemStatus; // 绯荤粺鏁翠綋杩愯鐘舵�佹弿杩�
+ char sysDataCollectionTime[50]; // 鏁版嵁閲囬泦鏃堕棿
+ char sysDeviceType[50]; // 璁惧绫诲瀷
+ char sysDeviceId[50]; // 璁惧缂栧彿
+ char sysDeviceStatus[50]; // 璁惧鐘舵��
+ char sysSystemStatus[50]; // 绯荤粺鏁翠綋杩愯鐘舵�佹弿杩�
int devId; // 瀵瑰簲璁惧璇︾粏淇℃伅琛ㄧ殑璁板綍缂栧彿
- QString devDeviceType; // 璁惧绫诲瀷锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧绫诲瀷瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
- QString devDeviceId; // 璁惧缂栧彿锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧缂栧彿瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
- QString devModel; // 璁惧鍨嬪彿
- QString runDeviceStatus; // 璁惧鐘舵��
- QString runFaultAlarmTime; // 鏁呴殰鎶ヨ鏃堕棿
- QString runFaultDescription; // 鏁呴殰璇︾粏鎻忚堪
+ char devDeviceType[50]; // 璁惧绫诲瀷锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧绫诲瀷瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
+ char devDeviceId[50]; // 璁惧缂栧彿锛堜笌绯荤粺杩愯鐘舵�佽〃涓殑璁惧缂栧彿瀵瑰簲锛屽彲鐢ㄤ簬鍏宠仈锛�
+ char devModel[50]; // 璁惧鍨嬪彿
+ char runDeviceStatus[50]; // 璁惧鐘舵��
+ char runFaultAlarmTime[50]; // 鏁呴殰鎶ヨ鏃堕棿
+ char runFaultDescription[50]; // 鏁呴殰璇︾粏鎻忚堪
int safetyId; // 瀵瑰簲璁惧瀹夊叏鐘舵�佽〃鐨勮褰曠紪鍙�
- QString safetyDataCollectionTime; // 鏁版嵁閲囬泦鏃堕棿锛堝彲鐢ㄤ簬鍏宠仈涓嶅悓琛ㄥ湪鍚屼竴鏃堕棿鐐圭殑鏁版嵁鎯呭喌锛�
- QString safetyDeviceType; // 璁惧绫诲瀷锛堢敤浜庡叧鑱旓級
- QString safetyDeviceId; // 璁惧缂栧彿锛堢敤浜庡叧鑱旓級
- QString safetyStatus; // 璁惧瀹夊叏鐘舵��
- QString safetyParameter; // 瀹夊叏鍙傛暟
+ char safetyDataCollectionTime[50]; // 鏁版嵁閲囬泦鏃堕棿锛堝彲鐢ㄤ簬鍏宠仈涓嶅悓琛ㄥ湪鍚屼竴鏃堕棿鐐圭殑鏁版嵁鎯呭喌锛�
+ char safetyDeviceType[50]; // 璁惧绫诲瀷锛堢敤浜庡叧鑱旓級
+ char safetyDeviceId[50]; // 璁惧缂栧彿锛堢敤浜庡叧鑱旓級
+ char safetyStatus[50]; // 璁惧瀹夊叏鐘舵��
+ char safetyParameter[50]; // 瀹夊叏鍙傛暟
};
// 鍘嗗彶鏌ヨ鍝嶅簲缁撴瀯浣�
// 瀹夊叏鐘舵�佽〃鐩稿叧淇℃伅
@@ -727,12 +739,7 @@
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 context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
int fileNum;
VersionInfoEntryReq()
--
Gitblit v1.8.0