From 828ba1dcdd1fa803dddf94f4f1643452d5efa703 Mon Sep 17 00:00:00 2001
From: gong <3218757026@qq.com>
Date: 星期三, 06 十一月 2024 15:08:44 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 165 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 116 insertions(+), 49 deletions(-)
diff --git a/common.h b/common.h
index 525f1f0..6d36e1f 100644
--- a/common.h
+++ b/common.h
@@ -90,6 +90,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 +284,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 +310,7 @@
struct ADRes//娣诲姞鍝嶅簲
{
Head head;
- int type;
+ int status;
ADRes() {
head.type = AD_RES;
head.len = sizeof(ADRes);
@@ -310,22 +318,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 +350,7 @@
struct QDRes//鏌ヨ鍝嶅簲
{
Head head;
- int type;
+ int status;
QDRes() {
head.type = QD_RES;
head.len = sizeof(QDRes);
@@ -613,10 +622,11 @@
//鐢熶骇璁″垝绠＄悊
struct PdplanInfo
{
- int id;//鐢熶骇璁″垝缂栧彿
- char planName[32];//鐢熶骇璁″垝鍚嶅瓧
+ int planId;//璁㈠崟缂栧彿
+ char planName[32];//璁㈠崟鍚嶅瓧
char startDate[32];//璧峰鏃ユ湡
- char closingDate[32];//鎴嚦鏃ユ湡
+ char closingDate[32];//浜や粯鏃ユ湡
+ char pdName[8];//浜у搧鍚�
double plannedPd;//璁″垝鐢熶骇閲�
double actualPd;//瀹為檯鐢熶骇閲�
double progress;//鐢熶骇杩涘害
@@ -626,7 +636,9 @@
struct MonoutputInfo
{
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
};
//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
@@ -700,12 +712,14 @@
struct QueryPdplanReq
{
Head head;
- int id;//鐢熶骇璁″垝缂栧彿
- char planName[32];//鐢熶骇璁″垝鍚嶅瓧
+ int planId;//璁㈠崟缂栧彿
+ char planName[32];//璁㈠崟鍒掑悕瀛�
char startDate[32];//璧峰鏃ユ湡
- char closingDate[32];//鎴嚦鏃ユ湡
+ char closingDate[32];//浜や粯鏃ユ湡
+ char pdName[8];//浜у搧鍚�
double plannedPd;//璁″垝鐢熶骇閲�
double actualPd;//瀹為檯鐢熶骇閲�
+ double progress;//鐢熶骇杩涘害
int finishOntime;//鏄惁鎸夋湡瀹屾垚
QueryPdplanReq() {
head.type = QUERY_PDPLAN_REQ;
@@ -798,7 +812,9 @@
{
Head head;
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
QueryMonoutputReq() {
head.type = QUERY_MONOUTPUT_REQ;
head.len = sizeof(QueryMonoutputReq);
@@ -820,40 +836,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