From 7771cfa2ee187ea9777d5725b75c58e3b49b791c Mon Sep 17 00:00:00 2001
From: Administrator <3174665893@qq.com>
Date: 星期二, 05 十一月 2024 15:04:39 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/common.h b/common.h
index 8c1266d..fb8ffa3 100644
--- a/common.h
+++ b/common.h
@@ -436,6 +436,8 @@
//鐜鏁版嵁鍝嶅簲
struct Environment
{
+ double longitude;//缁忓害
+ double latitude;//绾害
float temp;//娓╁害
float humidity;//婀垮害
float oxygen;//姘ф皵娴撳害
@@ -463,6 +465,8 @@
//璁惧鐘舵�佸搷搴�
struct DeviceStatus
{
+ double longitude;//缁忓害
+ double latitude;//绾害
int deviceID;//璁惧缂栧彿
char deviceName[32];//璁惧鍚嶇О
char deviceStatus[32];//璁惧鐘舵��
@@ -489,6 +493,8 @@
//鎿嶄綔鏃ュ織鍝嶅簲
struct MovementRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char userName;//鎿嶄綔鐢ㄦ埛鍚�
char operateTime[32];//鎿嶄綔鏃堕棿
char deviceName[32];//鎿嶄綔璁惧
@@ -516,8 +522,10 @@
//璀︽姤璁板綍鍝嶅簲
struct AlarmRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char alarmTime[32];//璀︽姤鏃堕棿
- char alarmtype[32];//閫氱煡鏃堕棿
+ char alarmtype[32];//澶勭悊鏃堕棿
char alarmContent[256];//璀︽姤鍐呭
};
struct AlarmRecordRes
@@ -605,10 +613,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;//鐢熶骇杩涘害
@@ -618,7 +627,9 @@
struct MonoutputInfo
{
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
};
//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
@@ -692,12 +703,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;
@@ -790,7 +803,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);
--
Gitblit v1.8.0