From e83d6dae07f7fa23b5cf116d80470bbf75ca87e5 Mon Sep 17 00:00:00 2001
From: jhc <2991879965@qq.com>
Date: 星期一, 04 十一月 2024 12:15:42 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/王琨元/document/表(1).docx | 0
/dev/null | 0
Server/王琨元/document/表.docx | 0
Server/胡家明/log/日志_胡家明_1102.doc | 0
参考文档/日志模板/紫鸾PCB_0927项目日报.doc | 0
参考规则_1030.txt | 13 +
Server/王琨元/log/日志模板_王琨元_1101.doc | 0
Client/龚启祥/log/日志模板_龚启祥_1104.doc | 0
Server/李转转/log/配置管理_李转转_1104.doc | 0
common.h | 696 ++++++++++++++++++++++++++++-----------------------------
Server/陈楚丹/log/日志_陈楚丹_1102.doc | 0
11 files changed, 360 insertions(+), 349 deletions(-)
diff --git "a/Client/\351\203\221\345\207\257\346\226\207/document/\346\230\206\344\273\2211031_\351\241\271\347\233\256\346\227\245\346\212\245.doc" "b/Client/\351\203\221\345\207\257\346\226\207/document/\346\230\206\344\273\2211031_\351\241\271\347\233\256\346\227\245\346\212\245.doc"
deleted file mode 100644
index b8194ea..0000000
--- "a/Client/\351\203\221\345\207\257\346\226\207/document/\346\230\206\344\273\2211031_\351\241\271\347\233\256\346\227\245\346\212\245.doc"
+++ /dev/null
Binary files differ
diff --git "a/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1104.doc" "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1104.doc"
new file mode 100644
index 0000000..975c519
--- /dev/null
+++ "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1104.doc"
Binary files differ
diff --git "a/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1104.doc" "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1104.doc"
new file mode 100644
index 0000000..28b9858
--- /dev/null
+++ "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1104.doc"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx"
deleted file mode 100644
index 8b245e2..0000000
--- "a/Server/\347\216\213\347\220\250\345\205\203/document/~$\350\241\250.docx"
+++ /dev/null
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250\0501\051.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250\0501\051.docx"
new file mode 100644
index 0000000..289d78b
--- /dev/null
+++ "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250\0501\051.docx"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx" "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx"
index 4c098dd..2768b80 100644
--- "a/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx"
+++ "b/Server/\347\216\213\347\220\250\345\205\203/document/\350\241\250.docx"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1101.doc" "b/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1101.doc"
new file mode 100644
index 0000000..cbc2406
--- /dev/null
+++ "b/Server/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1101.doc"
Binary files differ
diff --git "a/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1102.doc" "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1102.doc"
new file mode 100644
index 0000000..9499c7a
--- /dev/null
+++ "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1102.doc"
Binary files differ
diff --git "a/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1102.doc" "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1102.doc"
new file mode 100644
index 0000000..e41c22c
--- /dev/null
+++ "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1102.doc"
Binary files differ
diff --git a/common.h b/common.h
index e48cee1..e52d8d8 100644
--- a/common.h
+++ b/common.h
@@ -3,9 +3,9 @@
#include <string.h>
-enum TypeInfo{
+enum TypeInfo {
- //娉ㄥ唽鐧诲綍
+ //娉ㄥ唽鐧诲綍
LOGIN_REQ, // 鐧诲綍璇锋眰
LOGIN_RES, // 鐧诲綍鍝嶅簲
REGISTER_REQ, //娉ㄥ唽璇锋眰
@@ -14,47 +14,47 @@
RESET_RES, //閲嶇疆瀵嗙爜鍝嶅簲
- //鏉冮檺绠＄悊
- QUERY_PMS_REQ, // 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
- UPDATE_PMS_REQ, // 鎸夎鑹瞚d鏇存柊鏉冮檺淇℃伅璇锋眰
- QUERY_PMS_RES, // 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
- UPDATE_PMS_RES, // 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
+ //鏉冮檺绠＄悊
+ QUERY_PMS_REQ, // 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
+ UPDATE_PMS_REQ, // 鎸夎鑹瞚d鏇存柊鏉冮檺淇℃伅璇锋眰
+ QUERY_PMS_RES, // 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
+ UPDATE_PMS_RES, // 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
- //璁惧绠＄悊
- AD_REQ,//娣诲姞璁惧璇锋眰
+ //璁惧绠＄悊
+ AD_REQ,//娣诲姞璁惧璇锋眰
AD_RES,//娣诲姞璁惧鍝嶅簲
MD_REQ,//淇敼璁惧璇锋眰
MD_RES,//淇敼璁惧鍝嶅簲
QD_REQ,//鏌ヨ璁惧璇锋眰
QD_RES,//鏌ヨ璁惧鍝嶅簲
- //鍦板浘鏍囨敞
- MML_REQ,//鍦板浘鏍囨敞鍔犺浇璇锋眰
- MML_RES//鍦板浘鏍囨敞鍔犺浇鍝嶅簲
+ //鍦板浘鏍囨敞
+ MML_REQ,//鍦板浘鏍囨敞鍔犺浇璇锋眰
+ MML_RES,//鍦板浘鏍囨敞鍔犺浇鍝嶅簲
MMI_REQ,//鍦板浘鏍囨敞鎻掑叆璇锋眰
- MMI_RES//鍦板浘鏍囨敞鎻掑叆鍝嶅簲
+ MMI_RES,//鍦板浘鏍囨敞鎻掑叆鍝嶅簲
MMD_REQ,//鍦板浘鏍囨敞鍒犻櫎璇锋眰
- MMD_RES//鍦板浘鏍囨敞鍒犻櫎鍝嶅簲
+ MMD_RES,//鍦板浘鏍囨敞鍒犻櫎鍝嶅簲
//澶у睆鏄剧ず
ENVIRONMENT_REQ,//鐜鏁版嵁璇锋眰
- ENVIRONMENT_RES,//鐜鏁版嵁鍝嶅簲
- DEVICESTATUS_REQ,//璁惧鐘舵�佽姹�
- DEVICESTATUS_RES,//璁惧鐘舵�佸搷搴�
- MOVEMENTRECORD_REQ,//鎿嶄綔鏃ュ織璇锋眰
- MOVEMENTRECORD_RES,//鎿嶄綔鏃ュ織鍝嶅簲
- ALARMRECORD_REQ,//璀︽姤璁板綍璇锋眰
- ALARMRECORD_RES,//璀︽姤璁板綍鍝嶅簲
- YIELD_REQ,//鐓ょ熆浜ч噺璇锋眰
- YIELD_RES,//鐓ょ熆浜ч噺鍝嶅簲
+ ENVIRONMENT_RES,//鐜鏁版嵁鍝嶅簲
+ DEVICESTATUS_REQ,//璁惧鐘舵�佽姹�
+ DEVICESTATUS_RES,//璁惧鐘舵�佸搷搴�
+ MOVEMENTRECORD_REQ,//鎿嶄綔鏃ュ織璇锋眰
+ MOVEMENTRECORD_RES,//鎿嶄綔鏃ュ織鍝嶅簲
+ ALARMRECORD_REQ,//璀︽姤璁板綍璇锋眰
+ ALARMRECORD_RES,//璀︽姤璁板綍鍝嶅簲
+ YIELD_REQ,//鐓ょ熆浜ч噺璇锋眰
+ YIELD_RES,//鐓ょ熆浜ч噺鍝嶅簲
//璀︽姤绠＄悊
WARNING_REQ, // 璀︽姤璇锋眰
- WARNING_RES, // 璀︽姤鍝嶅簲
+ WARNING_RES, // 璀︽姤鍝嶅簲
- //鐢熶骇璁″垝绠＄悊
- ADD_PDPLAN_REQ,//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
+ //鐢熶骇璁″垝绠＄悊
+ ADD_PDPLAN_REQ,//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
ADD_PDPLAN_RES,//娣诲姞涓�鏉＄敓浜ц鍒掔殑鍝嶅簲缁撴瀯浣�
DEL_PDPLAN_REQ,//鍒犻櫎涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
DEL_PDPLAN_RES,//鍒犻櫎涓�鏉＄敓浜ц鍒掔殑鍝嶅簲缁撴瀯浣�
@@ -74,29 +74,28 @@
QUERY_MONOUTPUT_RES,//鏌ヨ鏈堜骇閲忕殑鍝嶅簲缁撴瀯浣�
- //鑷姩鍗囩骇
- VERSION_NUM_REQ, // 鐗堟湰鍙疯姹�
- VERSION_NUM_RES, // 鐗堟湰鍙峰搷搴�
- UPLOAD_FILE_REQ, // 涓婁紶鏂囦欢鐨勮姹�
- UPLOAD_FILE_RES, // 涓婁紶鏂囦欢鐨勫搷搴�
- VERSION_INFOENTRY_REQ, // 鐗堟湰淇℃伅褰曞叆璇锋眰
- VERSION_INFOENTRY_RES, //鐗堟湰淇℃伅褰曞叆鍝嶅簲
- VERSION_UPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
- VERSION_UPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
- FILE_DOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
- FILE_DOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
- DOWNLOAD_SUCCESSFULLY_RES // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
+ //鑷姩鍗囩骇
+ VERSION_NUM_REQ, // 鐗堟湰鍙疯姹�
+ VERSION_NUM_RES, // 鐗堟湰鍙峰搷搴�
+ UPLOAD_FILE_REQ, // 涓婁紶鏂囦欢鐨勮姹�
+ UPLOAD_FILE_RES, // 涓婁紶鏂囦欢鐨勫搷搴�
+ VERSION_INFOENTRY_REQ, // 鐗堟湰淇℃伅褰曞叆璇锋眰
+ VERSION_INFOENTRY_RES, //鐗堟湰淇℃伅褰曞叆鍝嶅簲
+ VERSION_UPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
+ VERSION_UPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
+ FILE_DOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
+ FILE_DOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
+ DOWNLOAD_SUCCESSFULLY_RES, // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
- //鏃ュ織
- LOGSEARCH_REQ;//鏃ュ織鏌ヨ璇锋眰
- LOGSEARCH_RES;//鏃ュ織鏌ヨ鍝嶅簲
+ //鏃ュ織
+ LOGSEARCH_REQ,//鏃ュ織鏌ヨ璇锋眰
+ LOGSEARCH_RES,//鏃ュ織鏌ヨ鍝嶅簲
-
};
-struct Head{
- int type;
- int len;
+struct Head {
+ int type;
+ int len;
};
//娉ㄥ唽鐧诲綍
@@ -106,12 +105,12 @@
Head head;
char userName[32];
char password[32];
- LoginReq(){
+ LoginReq() {
head.type = LOGIN_REQ;
head.len = sizeof(LoginReq);
}
};
-
+
struct Permission
{
int admin;//瓒呯骇绠＄悊鍛�
@@ -124,7 +123,7 @@
int productPlan;//鐢熶骇璁″垝
char roleName[32]; // 瑙掕壊鍚�
};
-
+
//鐧诲綍鍝嶅簲
struct LoginRes
{
@@ -149,7 +148,7 @@
char email[50];
char capcha[10];//楠岃瘉鐮�
char telephone[32];
- RegisterReq(){
+ RegisterReq() {
head.type = REGISTER_REQ;
head.len = sizeof(RegisterReq);
}
@@ -176,7 +175,7 @@
char capcha[10];//楠岃瘉鐮�
char password[32];//鏂板瘑鐮�
char confirmPassword[32];//纭瀵嗙爜
- ResetReq(){
+ ResetReq() {
head.type = RESET_REQ;
head.len = sizeof(ResetReq);
}
@@ -197,79 +196,79 @@
//鏉冮檺绠＄悊
// 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
-typedef struct QueryPmsReq{
- Head head;
- char userNo[32];
- char name[32];
- char permissonType[32];
- QueryPmsReq(){
- head.type=QUERY_PMS_REQ;
- memset(userNo,0,32);
- memset(permissonType,0,32);
- memset(name,0,32);
- head.len = sizeof(QueryPmsReq);
- }
+typedef struct QueryPmsReq {
+ Head head;
+ char userNo[32];
+ char name[32];
+ char permissonType[32];
+ QueryPmsReq() {
+ head.type = QUERY_PMS_REQ;
+ memset(userNo, 0, 32);
+ memset(permissonType, 0, 32);
+ memset(name, 0, 32);
+ head.len = sizeof(QueryPmsReq);
+ }
} QueryPmsReq;
// 鎸夎鑹瞚d鏇存柊鏉冮檺淇℃伅璇锋眰
-typedef struct UpdatePmsReq{
- Head head;
- // 浜哄憳琛ㄤ富閿甶d
- int id;
- int queryHistory;
- int loggerSearch;
- int mapMark;
- int devManage;
- int productPlan;
- int warningManage;
- int versionManage; //鐗堟湰绠＄悊
- int admin; //绯荤粺绠＄悊鍛�
- UpdatePmsReq(){
- head.type=QUERY_PMS_RES;
- head.len = sizeof(UpdatePmsReq);
- }
+typedef struct UpdatePmsReq {
+ Head head;
+ // 浜哄憳琛ㄤ富閿甶d
+ int id;
+ int queryHistory;
+ int loggerSearch;
+ int mapMark;
+ int devManage;
+ int productPlan;
+ int warningManage;
+ int versionManage; //鐗堟湰绠＄悊
+ int admin; //绯荤粺绠＄悊鍛�
+ UpdatePmsReq() {
+ head.type = QUERY_PMS_RES;
+ head.len = sizeof(UpdatePmsReq);
+ }
} UpdatePmsReq;
// 鍗曚釜浜哄憳鍜屾潈闄愯仈鍚堟煡璇㈢粨鏋勪綋
-typedef struct PmsRes{
- int queryHistory;
- int loggerSearch;
- int mapMark;
- int devManage;
- int productPlan;
- int id;
+typedef struct PmsRes {
+ int queryHistory;
+ int loggerSearch;
+ int mapMark;
+ int devManage;
+ int productPlan;
+ int id;
- char userNo[32];
- char name[32];
+ char userNo[32];
+ char name[32];
- char permissonType[32]; // 瑙掕壊绫诲瀷
- int versionManage; //鐗堟湰绠＄悊
- int admin; //绯荤粺绠＄悊鍛�
- char department[32];
- char loginTime[32];
- char registerTime[32];
+ char permissonType[32]; // 瑙掕壊绫诲瀷
+ int versionManage; //鐗堟湰绠＄悊
+ int admin; //绯荤粺绠＄悊鍛�
+ char department[32];
+ char loginTime[32];
+ char registerTime[32];
} PmsRes;
// 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
-typedef struct QueryPmsRes{
- Head head;
- int success; // 1涓烘垚鍔� ,0涓哄け璐�
- PmsRes pmsList[0];
- QueryPmsRes(){
- head.type=QUERY_PMS_REQ;
- }
+typedef struct QueryPmsRes {
+ Head head;
+ int success; // 1涓烘垚鍔� ,0涓哄け璐�
+ PmsRes pmsList[0];
+ QueryPmsRes() {
+ head.type = QUERY_PMS_REQ;
+ }
} QueryPmsRes;
// 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
-struct UpdatePmsRes{
- Head head;
- int success; // 1涓烘垚鍔� ,0涓哄け璐�
- UpdatePmsRes(){
- head.type = UPDATE_PMS_RES;
- head.len = sizeof(UpdatePmsRes);
- }
+struct UpdatePmsRes {
+ Head head;
+ int success; // 1涓烘垚鍔� ,0涓哄け璐�
+ UpdatePmsRes() {
+ head.type = UPDATE_PMS_RES;
+ head.len = sizeof(UpdatePmsRes);
+ }
-} UpdatePmsRes ;
+} UpdatePmsRes;
@@ -364,7 +363,7 @@
struct MMLReq//鍦板浘
{
Head head;
- MMLReq(){
+ MMLReq() {
head.type = MML_REQ;
head.len = sizeof(MMLReq);
}
@@ -375,7 +374,7 @@
Head head;
int status;//鎿嶄綔鐘舵��
MarkInfo info[0];
- MMLRes(){
+ MMLRes() {
head.type = MML_RES;
head.len = sizeof(MMLRes);
}
@@ -385,7 +384,7 @@
{
Head head;
MarkInfo info[0];
- MMIReq(){
+ MMIReq() {
head.type = MMI_REQ;
head.len = sizeof(MMIReq);
}
@@ -396,7 +395,7 @@
Head head;
int status;//鎿嶄綔鐘舵��
MarkInfo info[0];
- MMIRes(){
+ MMIRes() {
head.type = MMI_RES;
head.len = sizeof(MMIRes);
}
@@ -407,7 +406,7 @@
{
Head head;
MarkInfo info[0];
- MMIReq(){
+ MMDReq() {
head.type = MMD_REQ;
head.len = sizeof(MMDReq);
}
@@ -418,7 +417,7 @@
Head head;
int status;//鎿嶄綔鐘舵��
MarkInfo info[0];
- MMDRes(){
+ MMDRes() {
head.type = MMD_RES;
head.len = sizeof(MMDRes);
}
@@ -428,180 +427,180 @@
//鐜鏁版嵁璇锋眰
struct EnvironmentReq
{
- Head head;
- EnvironmentReq(){
- head.type = ENVIRONMENT_REQ;
- head.len = sizeof(EnvironmentReq);
- }
+ Head head;
+ EnvironmentReq() {
+ head.type = ENVIRONMENT_REQ;
+ head.len = sizeof(EnvironmentReq);
+ }
};
//鐜鏁版嵁鍝嶅簲
struct Environment
{
- float temp;//娓╁害
- float humidity;//婀垮害
- float oxygen;//姘ф皵娴撳害
- float carbon;//涓�姘у寲纰虫祿搴�
+ float temp;//娓╁害
+ float humidity;//婀垮害
+ float oxygen;//姘ф皵娴撳害
+ float carbon;//涓�姘у寲纰虫祿搴�
};
struct EnvironmentRes
{
- Head head;
- int status;
- Environment environment[0];
- EnvironmentRes(){
- head.type = ENVIRONMENT_RES;
- head.len = sizeof(EnvironmentRes);
- }
+ Head head;
+ int status;
+ Environment environment[0];
+ EnvironmentRes() {
+ head.type = ENVIRONMENT_RES;
+ head.len = sizeof(EnvironmentRes);
+ }
};
//璁惧鐘舵�佽姹�
struct DeviceStatusReq
{
- Head head;
- DeviceStatusReq(){
- head.type = DEVICESTATUS_REQ;
- head.len = sizeof(DeviceStatusReq);
- }
+ Head head;
+ DeviceStatusReq() {
+ head.type = DEVICESTATUS_REQ;
+ head.len = sizeof(DeviceStatusReq);
+ }
};
//璁惧鐘舵�佸搷搴�
struct DeviceStatus
{
- int deviceID;//璁惧缂栧彿
- char deviceName[32];//璁惧鍚嶇О
- char deviceStatus[32];//璁惧鐘舵��
+ int deviceID;//璁惧缂栧彿
+ char deviceName[32];//璁惧鍚嶇О
+ char deviceStatus[32];//璁惧鐘舵��
};
struct DeviceStatusRes
{
- Head head;
- int status;
- DeviceStatus deviceStatus[0];
- DeviceStatusRes(){
- head.type = DEVICESTATUS_RES;
- head.len = sizeof(DeviceStatusRes);
- }
+ Head head;
+ int status;
+ DeviceStatus deviceStatus[0];
+ DeviceStatusRes() {
+ head.type = DEVICESTATUS_RES;
+ head.len = sizeof(DeviceStatusRes);
+ }
};
//鎿嶄綔鏃ュ織璇锋眰
struct MovementRecordReq
{
- Head head;
- MovementRecordReq(){
- head.type = MOVEMENTRECORD_REQ;
- head.len = sizeof(MovementRecordReq);
- }
+ Head head;
+ MovementRecordReq() {
+ head.type = MOVEMENTRECORD_REQ;
+ head.len = sizeof(MovementRecordReq);
+ }
};
//鎿嶄綔鏃ュ織鍝嶅簲
struct MovementRecord
{
- char userName;//鎿嶄綔鐢ㄦ埛鍚�
- char operateTime[32];//鎿嶄綔鏃堕棿
- char deviceName[32];//鎿嶄綔璁惧
- char movement[256];//鎿嶄綔鎻忚堪
+ char userName;//鎿嶄綔鐢ㄦ埛鍚�
+ char operateTime[32];//鎿嶄綔鏃堕棿
+ char deviceName[32];//鎿嶄綔璁惧
+ char movement[256];//鎿嶄綔鎻忚堪
};
struct MovementRecordRes
{
- Head head;
- int status;
- MovementRecord movementRecord[0];
- MovementRecordRes(){
- head.type = MOVEMENTRECORD_RES;
- head.len = sizeof(MovementRecordRes);
- }
+ Head head;
+ int status;
+ MovementRecord movementRecord[0];
+ MovementRecordRes() {
+ head.type = MOVEMENTRECORD_RES;
+ head.len = sizeof(MovementRecordRes);
+ }
};
//璀︽姤璁板綍璇锋眰
struct AlarmRecordReq
{
- Head head;
- AlarmRecordReq(){
- head.type = ALARMRECORD_REQ;
- head.len = sizeof(AlarmRecordReq);
- }
+ Head head;
+ AlarmRecordReq() {
+ head.type = ALARMRECORD_REQ;
+ head.len = sizeof(AlarmRecordReq);
+ }
};
//璀︽姤璁板綍鍝嶅簲
struct AlarmRecord
{
- char alarmTime[32];//璀︽姤鏃堕棿
- char alarmtype[32];//閫氱煡鏃堕棿
- char alarmContent[256];//璀︽姤鍐呭
+ char alarmTime[32];//璀︽姤鏃堕棿
+ char alarmtype[32];//閫氱煡鏃堕棿
+ char alarmContent[256];//璀︽姤鍐呭
};
struct AlarmRecordRes
{
- Head head;
- int status;
- AlarmRecord alarmRecord[0];
- AlarmRecordRes(){
- head.type = ALARMRECORD_RES;
- head.len = sizeof(AlarmRecordRes);
- }
+ Head head;
+ int status;
+ AlarmRecord alarmRecord[0];
+ AlarmRecordRes() {
+ head.type = ALARMRECORD_RES;
+ head.len = sizeof(AlarmRecordRes);
+ }
};
//鐓ょ熆浜ч噺璇锋眰
struct YieldReq
{
- Head head;
- YieldReq(){
- head.type = YIELD_REQ;
- head.len = sizeof(YieldReq);
- }
+ Head head;
+ YieldReq() {
+ head.type = YIELD_REQ;
+ head.len = sizeof(YieldReq);
+ }
};
//鐓ょ熆浜ч噺鍝嶅簲
struct Yield
{
- int month;//鏈堜唤
- int output;//浜ч噺
+ int month;//鏈堜唤
+ int output;//浜ч噺
};
struct YieldRes
{
- Head head;
- int status;
- Yield yield[0];
- YieldRes(){
- head.type = YIELD_RES;
- head.len = sizeof(YieldRes);
- }
+ Head head;
+ int status;
+ Yield yield[0];
+ YieldRes() {
+ head.type = YIELD_RES;
+ head.len = sizeof(YieldRes);
+ }
};
//璀︽姤绠＄悊
// 璀︽姤璇锋眰缁撴瀯浣�
-struct WarningReq {
- Head head;
-
- float oxygenWarning;
- float carbonWarning;
- float tempWarning;
- float humidityWarning;
+struct WarningReq {
+ Head head;
- WarningReq() {
- head.type = WARNING_REQ;
- head.len = sizeof(WarningReq);
- }
-};
+ float oxygenWarning;
+ float carbonWarning;
+ float tempWarning;
+ float humidityWarning;
-
-struct DataThreshold{
- //闃堝��
- float oxygenThreshold;
- float carbonThreshold;
- float tempThreshold;
- float humidityThreshold;
+ WarningReq() {
+ head.type = WARNING_REQ;
+ head.len = sizeof(WarningReq);
+ }
};
-struct Data{
- float oxygen; // 姘ф皵娴撳害
- float carbon; // 涓�姘у寲纰虫祿搴�
- float temp; // 娓╁害
- float humidity; // 婀垮害
+
+struct DataThreshold {
+ //闃堝��
+ float oxygenThreshold;
+ float carbonThreshold;
+ float tempThreshold;
+ float humidityThreshold;
+};
+
+struct Data {
+ float oxygen; // 姘ф皵娴撳害
+ float carbon; // 涓�姘у寲纰虫祿搴�
+ float temp; // 娓╁害
+ float humidity; // 婀垮害
};
// 璀︽姤鍝嶅簲缁撴瀯浣�
-struct WarningRes {
- Head head;
- int status; // 鍝嶅簲鐘舵�侊紙姣斿 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触绛夛級
- const char* message; // 鍝嶅簲娑堟伅鎻忚堪
+struct WarningRes {
+ Head head;
+ int status; // 鍝嶅簲鐘舵�侊紙姣斿 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触绛夛級
+ const char* message; // 鍝嶅簲娑堟伅鎻忚堪
- WarningRes(int stat, const char* msg) {
- head.type = WARNING_RES;
- head.len = sizeof(WarningRes);
- status = stat;
- message = msg;
- }
-};
+ WarningRes(int stat, const char* msg) {
+ head.type = WARNING_RES;
+ head.len = sizeof(WarningRes);
+ status = stat;
+ message = msg;
+ }
+};
//鐢熶骇璁″垝绠＄悊
struct PdplanInfo
@@ -822,40 +821,39 @@
//鍘嗗彶鏌ヨ鍒嗘瀽
// 鍘嗗彶鏌ヨ璇锋眰缁撴瀯浣�
struct HistoryQueryReq {
- Head head;
- //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
- char startTime[32];
- char endTime[32];
- //鍏抽敭瀛楁煡璇�
- char keyWord[32];
- HistoryQueryReq() {
- // 鍒濆鍖栨暟鎹ご
- head.type = HISTORY_QUERY_REQ;
- head.len = sizeof(HistoryQueryReq);
- // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
- std::memset(startTime, 0, sizeof(startTime));
- std::memset(endTime, 0, sizeof(endTime));
+ Head head;
+ //鏍规嵁鏃堕棿鑼冨洿鏌ヨ
+ char startTime[32];
+ char endTime[32];
+ //鍏抽敭瀛楁煡璇�
+ char keyWord[32];
+ HistoryQueryReq() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = QUERY_MONOUTPUT_REQ;
+ head.len = sizeof(HistoryQueryReq);
+ // 鍒濆鍖栨煡璇㈡潯浠跺瓧娈�
+ std::memset(startTime, 0, sizeof(startTime));
+ std::memset(endTime, 0, sizeof(endTime));
- }
+ }
};
// 鍘嗗彶鏌ヨ鍝嶅簲缁撴瀯浣�
// 绯荤粺杩愯鐘舵�佽〃鐩稿叧淇℃伅
struct HistroyInfo {
- WarningRes warn;//璀︽姤鏌ヨ
- QDRes dev;//璁惧鏌ヨ
- ProductionPlanRes pro;//鐢熶骇璁″垝鏌ヨ
+ WarningRes warn;//璀︽姤鏌ヨ
+ QDRes dev;//璁惧鏌ヨ
+ QueryPdplanRes pro;//鐢熶骇璁″垝鏌ヨ
};
struct HistoryQueryRes {
- Head head;
- HistroyInfo sys[0];
- HistoryQueryRes() {
- // 鍒濆鍖栨暟鎹ご
- head.type = HISTORY_QUERY_RES;
- head.len = sizeof(HistoryQueryRes);
- sys = nullptr;
- }
+ Head head;
+ HistroyInfo sys[0];
+ HistoryQueryRes() {
+ // 鍒濆鍖栨暟鎹ご
+ head.type = QUERY_MONOUTPUT_RES;
+ head.len = sizeof(HistoryQueryRes);
+ }
};
@@ -884,7 +882,7 @@
{
char fileName[256];
long long fileSize;
- char s_filepath[128];
+ char s_filepath[128];
char content[0];
};
@@ -899,120 +897,120 @@
};
struct UploadFileRes { // 涓婁紶鏂囦欢鐨勫搷搴�
- Head head;
- bool state = false;
- char fileName[256];
- long long file_size;
- UploadFileRes()
- {
- head.type = UPLOAD_FILE_RES;
- head.len = sizeof(UploadFileRes);
- }
+ Head head;
+ bool state = false;
+ char fileName[256];
+ long long file_size;
+ UploadFileRes()
+ {
+ head.type = UPLOAD_FILE_RES;
+ head.len = sizeof(UploadFileRes);
+ }
};
// 鐗堟湰淇℃伅褰曞叆
// 璇锋眰
struct VersionInfoEntryReq {
- Head head;
- char versionId[64]; // 鐗堟湰鍙�
- char versionIdOld[64]; // 涓婁竴涓増鏈彿
- char context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
- int fileNum;
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ char versionIdOld[64]; // 涓婁竴涓増鏈彿
+ int fileNum;
+ char context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
- VersionInfoEntryReq()
- {
- head.type = VERSION_INFOENTRY_REQ;
- head.len = sizeof(VersionInfoEntryReq);
- }
+ VersionInfoEntryReq()
+ {
+ head.type = VERSION_INFOENTRY_REQ;
+ head.len = sizeof(VersionInfoEntryReq);
+ }
};
// 鐗堟湰淇℃伅褰曞叆鍝嶅簲
struct VersionInfoEntryRes {
- Head head;
- bool state = false;
- VersionInfoEntryRes()
- {
- head.type = VERSION_INFOENTRY_RES;
- head.len = sizeof(VersionInfoEntryRes);
- }
+ Head head;
+ bool state = false;
+ VersionInfoEntryRes()
+ {
+ head.type = VERSION_INFOENTRY_RES;
+ head.len = sizeof(VersionInfoEntryRes);
+ }
};
// 鐗堟湰鏇存柊璇锋眰
struct VersionUpdateReq {
- Head head;
+ Head head;
- char curVersionId[64]; // 鐗堟湰鍙�
- VersionUpdateReq()
- {
- head.type = VERSION_UPDATE_REQ;
- head.len = sizeof(VersionUpdateReq);
- }
+ char curVersionId[64]; // 鐗堟湰鍙�
+ VersionUpdateReq()
+ {
+ head.type = VERSION_UPDATE_REQ;
+ head.len = sizeof(VersionUpdateReq);
+ }
};
// 鐗堟湰鏇存柊鍝嶅簲
struct VersionUpdateRes {
- Head head;
- bool state = false;
- char versionId[64]; // 鐗堟湰鍙�
- char updateDate[32]; // 鏇存柊鏃堕棿
- char versionDescription[1024]; //鏇存柊鎻忚堪
+ Head head;
+ bool state = false;
+ char versionId[64]; // 鐗堟湰鍙�
+ char updateDate[32]; // 鏇存柊鏃堕棿
+ char versionDescription[1024]; //鏇存柊鎻忚堪
- VersionUpdateRes()
- {
- head.type = VERSION_UPDATE_RES;
- head.len = sizeof(VersionUpdateRes);
- }
+ VersionUpdateRes()
+ {
+ head.type = VERSION_UPDATE_RES;
+ head.len = sizeof(VersionUpdateRes);
+ }
};
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
struct FileDownloadsReq {
- Head head;
- char versionId[64]; // 鐗堟湰鍙�
- FileDownloadsReq()
- {
- head.type = FILE_DOWNLOADS_REQ;
- head.len = sizeof(FileDownloadsReq);
- }
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ FileDownloadsReq()
+ {
+ head.type = FILE_DOWNLOADS_REQ;
+ head.len = sizeof(FileDownloadsReq);
+ }
};
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
struct FileDownloadsRes {
- Head head;
- char versionId[64]; // 鐗堟湰鍙�
- char filename[128]; //鏂囦欢鍚�
- long long filesize; //鏂囦欢澶у皬
- char c_filepath[128]; //瀹㈡埛绔斁鏈�鏂扮増鏈殑鏈湴璺緞
- int fileNum; // 鏂囦欢鏁伴噺
- long long allFileSize; // 鏂囦欢鎬诲ぇ灏�
- char content[0];
- FileDownloadsRes()
- {
- head.type = FILE_DOWNLOADS_RES;
- head.len = sizeof(FileDownloadsRes);
- }
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ char filename[128]; //鏂囦欢鍚�
+ long long filesize; //鏂囦欢澶у皬
+ char c_filepath[128]; //瀹㈡埛绔斁鏈�鏂扮増鏈殑鏈湴璺緞
+ int fileNum; // 鏂囦欢鏁伴噺
+ long long allFileSize; // 鏂囦欢鎬诲ぇ灏�
+ char content[0];
+ FileDownloadsRes()
+ {
+ head.type = FILE_DOWNLOADS_RES;
+ head.len = sizeof(FileDownloadsRes);
+ }
};
// 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
-struct DownloadSuccessfullyRes{
- Head head;
- bool state = false;
- char fileName[256];
- long long fileSize;
- DownloadSuccessfullyRes()
- {
- head.type = DOWNLOAD_SUCCESSFULLY_RES;
- head.len = sizeof(DownloadSuccessfullyRes);
- }
+struct DownloadSuccessfullyRes {
+ Head head;
+ bool state = false;
+ char fileName[256];
+ long long fileSize;
+ DownloadSuccessfullyRes()
+ {
+ head.type = DOWNLOAD_SUCCESSFULLY_RES;
+ head.len = sizeof(DownloadSuccessfullyRes);
+ }
};
//鏃ュ織
-struct ParsedLog {
- char timeStamp[64]; // 鏃堕棿鎴�
- char deviceId[64]; // 璁惧ID
- char level[16]; 聽 聽 // 鏃ュ織绾у埆
- char content[256]; 聽// 鏃ュ織鍐呭
- char userId[64]; 聽 // 鐢ㄦ埛ID
+struct ParsedLog {
+ char timeStamp[64]; // 鏃堕棿鎴�
+ char deviceId[64]; // 璁惧ID
+ char level[16]; // 鏃ュ織绾у埆
+ char content[256]; // 鏃ュ織鍐呭
+ char userId[64]; // 鐢ㄦ埛ID
char fileName[32]; //鏂囦欢鍚�
char functionName[32]; //鍑芥暟鍚�
int problemLine; //浜х敓閿欒琛屽彿
@@ -1021,29 +1019,29 @@
// 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
// 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
struct LogQueryReq {
- Head head; // 鏁版嵁澶�
- char timeStamp[64]; // 鏃堕棿鎴�
- char content[256]; 聽 // 鏃ュ織鍐呭
- char level[16]; //鏃ュ織绾у埆
- char deviceId[64]; // 璁惧ID
- // 鏃犲弬鏋勯�犲嚱鏁�
- LogQueryReq() {
- head.type = LOGSEARCH_REQ;
- head.len = sizeof(LogQueryReq);
- }
+ Head head; // 鏁版嵁澶�
+ char timeStamp[64]; // 鏃堕棿鎴�
+ char content[256]; // 鏃ュ織鍐呭
+ char level[16]; //鏃ュ織绾у埆
+ char deviceId[64]; // 璁惧ID
+ // 鏃犲弬鏋勯�犲嚱鏁�
+ LogQueryReq() {
+ head.type = LOGSEARCH_REQ;
+ head.len = sizeof(LogQueryReq);
+ }
};
// 鏃ュ織鏌ヨ鍝嶅簲缁撴瀯浣�
struct LogQueryRes {
- Head head;
- int status; // 鍝嶅簲鐘舵�� (濡� 0 琛ㄧず鎴愬姛锛岄潪 0 琛ㄧず澶辫触)
- char errorMessage[256]; // 閿欒淇℃伅锛堝鏋滄湁锛�
-
- // 鏃犲弬鏋勯�犲嚱鏁�
- LogQueryRes() {
- head.type = LOGSEARCH_RES;
- head.len = sizeof(LogQueryRes);
- }
+ Head head;
+ int status; // 鍝嶅簲鐘舵�� (濡� 0 琛ㄧず鎴愬姛锛岄潪 0 琛ㄧず澶辫触)
+ char errorMessage[256]; // 閿欒淇℃伅锛堝鏋滄湁锛�
+
+ // 鏃犲弬鏋勯�犲嚱鏁�
+ LogQueryRes() {
+ head.type = LOGSEARCH_RES;
+ head.len = sizeof(LogQueryRes);
+ }
};
diff --git "a/\345\217\202\350\200\203\346\226\207\346\241\243/\346\227\245\345\277\227\346\250\241\346\235\277/\347\264\253\351\270\276PCB_0927\351\241\271\347\233\256\346\227\245\346\212\245.doc" "b/\345\217\202\350\200\203\346\226\207\346\241\243/\346\227\245\345\277\227\346\250\241\346\235\277/\347\264\253\351\270\276PCB_0927\351\241\271\347\233\256\346\227\245\346\212\245.doc"
index cce7e9c..1b734ad 100644
--- "a/\345\217\202\350\200\203\346\226\207\346\241\243/\346\227\245\345\277\227\346\250\241\346\235\277/\347\264\253\351\270\276PCB_0927\351\241\271\347\233\256\346\227\245\346\212\245.doc"
+++ "b/\345\217\202\350\200\203\346\226\207\346\241\243/\346\227\245\345\277\227\346\250\241\346\235\277/\347\264\253\351\270\276PCB_0927\351\241\271\347\233\256\346\227\245\346\212\245.doc"
Binary files differ
diff --git "a/\345\217\202\350\200\203\350\247\204\345\210\231_1030.txt" "b/\345\217\202\350\200\203\350\247\204\345\210\231_1030.txt"
index e91d94f..c5a5f59 100644
--- "a/\345\217\202\350\200\203\350\247\204\345\210\231_1030.txt"
+++ "b/\345\217\202\350\200\203\350\247\204\345\210\231_1030.txt"
@@ -124,7 +124,20 @@
鎴栬�� LoginBusiness
================================================
+ Qt--UI
+ --瀹炵幇鍔熻兘锛�
+ -- 娣诲姞璁惧锛歎I涓婂～涓�浜涜澶囦俊鎭細鍚嶅瓧 鍨嬪彿 缁忓害 绾害 绛�
+ -- 娣诲姞鎸夐挳锛氭妸璁惧淇℃伅鎷垮嚭鏉�--娣诲姞鍒扮粨鏋勪綋閲岄潰[璇锋眰缁撴瀯浣揮
+ -- 浣跨敤socket--鍙戦�佽姹傜粨鏋勪綋
+ VS--澶勭悊涓�浜涗笟鍔★細
+ 鍏朵粬浜鸿礋璐ｏ細鏀跺寘--瑙ｅ寘--鎷垮埌璇锋眰缁撴瀯浣�--璋冪敤娣诲姞璁惧鐨勪笟鍔PI[璐熻矗]
+ --鍙傛暟锛氳姹傜粨鏋勪綋鎸囬拡锛屽鎺ュ瓧
+ --鎿嶄綔锛氶�氳繃璇锋眰淇℃伅--缁勮SQL璇彞[鎻掑叆璇彞]--璋冪敤MySQL绫荤殑API--鎷垮埌SQL璇彞鐨勬墽琛岀粨鏋�--鏍规嵁缁撴灉缁勮 鍝嶅簲缁撴瀯浣� -- 鍙戝寘--缁欏鎴风
+
+ Qt--UI:
+ -- 鏀跺寘-瑙ｅ寘--鎷垮埌鍝嶅簲缁撴瀯浣揫鍒汉]--璋冪敤鍝嶅簲涓氬姟API[璐熻矗]--鎻愮ず娣诲姞鐨勭姸鎬乕鎴愬姛/澶辫触]
+
--
Gitblit v1.8.0