From a339319c8b301a1a817cc87bac4d3dfb492ea2bb Mon Sep 17 00:00:00 2001
From: 杜润昆 <1171266357@qq.com>
Date: 星期四, 08 八月 2024 09:34:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23
---
Client/胡宵/log/~WRL0002.tmp | 0
Server/宗玛帝/log/EF-P日志_宗玛帝_202040803.doc | 0
Client/孟喆/code/Real_time_translation.zip | 0
Client/王一博/log/王一博-0802.doc | 0
Client/范蓉/document/设备结构体.txt | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++
Client/范蓉/log/范蓉_2024.8.2.doc | 0
Client/范蓉/document/生产计划和设备管理 .docx | 0
Client/张健钰/log/地图标注日志_张健钰_0802.docx | 0
Client/胡宵/log/历史查询分析_胡宵_2024.8.7.doc | 0
Server/袁晨琳/log/日志_袁晨琳_0802.doc | 0
Client/胡宵/log/历史查询分析_胡宵_2024.8.2.doc | 0
Server/宗玛帝/log/EF-P日志_宗玛帝_202040802.doc | 0
/dev/null | 0
Client/李颖怡/log/日志模板_李颖怡_20240802.doc | 0
Client/何小豪/log/日志_何小豪_0802.doc | 0
Server/宗玛帝/log/~WRL0003.tmp | 0
Client/李颖怡/log/日志模板_李颖怡_20240803.doc | 0
Client/孟喆/log/大屏显示日志0807.doc | 0
Client/李颖怡/log/日志模板_李颖怡_20240805.doc | 0
19 files changed, 150 insertions(+), 0 deletions(-)
diff --git "a/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0802.doc" "b/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0802.doc"
new file mode 100644
index 0000000..3d327f1
--- /dev/null
+++ "b/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0802.doc"
Binary files differ
diff --git "a/Client/\345\255\237\345\226\206/code/Real_time_translation.zip" "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip"
new file mode 100644
index 0000000..7d7e5ab
--- /dev/null
+++ "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip"
Binary files differ
diff --git "a/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc" "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc"
new file mode 100644
index 0000000..5c85bf4
--- /dev/null
+++ "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc"
Binary files differ
diff --git "a/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0802.docx" "b/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0802.docx"
new file mode 100644
index 0000000..7b79b67
--- /dev/null
+++ "b/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0802.docx"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc"
new file mode 100644
index 0000000..a9f70d1
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc"
new file mode 100644
index 0000000..be0812f
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc"
new file mode 100644
index 0000000..d614abd
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0802.doc"
similarity index 68%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0802.doc"
index f5576a6..f05ad86 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0802.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
similarity index 80%
rename from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
rename to "Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
index f5576a6..0a8a47f 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.2.doc"
similarity index 80%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.2.doc"
index f5576a6..0a8a47f 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.2.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
similarity index 73%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
index f5576a6..94d17cc 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
Binary files differ
diff --git "a/Client/\350\214\203\350\223\211/document/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206 .docx" "b/Client/\350\214\203\350\223\211/document/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206 .docx"
index 494ceed..4338e51 100644
--- "a/Client/\350\214\203\350\223\211/document/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206 .docx"
+++ "b/Client/\350\214\203\350\223\211/document/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206 .docx"
Binary files differ
diff --git "a/Client/\350\214\203\350\223\211/document/\350\256\276\345\244\207\347\273\223\346\236\204\344\275\223.txt" "b/Client/\350\214\203\350\223\211/document/\350\256\276\345\244\207\347\273\223\346\236\204\344\275\223.txt"
new file mode 100644
index 0000000..1657f13
--- /dev/null
+++ "b/Client/\350\214\203\350\223\211/document/\350\256\276\345\244\207\347\273\223\346\236\204\344\275\223.txt"
@@ -0,0 +1,150 @@
+enum TypeInfo{
+ DEVICESELECT_REQ, //鏌ョ湅璁惧璇锋眰
+ DEVICESELECT_RES, //鏌ョ湅璁惧鍝嶅簲
+
+ DEVICEADD_REQ, //澧炲姞璁惧璇锋眰
+ DEVICEADD_RES, //澧炲姞璁惧鍝嶅簲
+
+ DEVICEDELETE_REQ, //鍒犻櫎璁惧璇锋眰
+ DEVICEDELETE_RES, //鍒犻櫎璁惧鍝嶅簲
+
+ DEVICEUPDATE_REQ, //淇敼璁惧璇锋眰
+ DEVICEUPDATE_RES, //淇敼璁惧鍝嶅簲
+
+ DEVICESELECTALL_REQ,//鏌ョ湅鍏ㄩ儴璁惧璇锋眰
+ DEVICESELECTALL_RES//鏌ョ湅鍏ㄩ儴璁惧鍝嶅簲
+};
+
+struct Head
+{
+ int type;//鍖哄垎涓嶅悓鍔熻兘缁撴瀯浣�
+ int lenth;//琛ㄧず褰撳墠灏佸寘闀垮害锛屼富瑕佽В鍐冲勾绮樺寘銆佹媶鍖呯殑鎿嶄綔
+ // int flag;
+};
+
+//璁惧淇℃伅
+struct DeviceData {
+ int id; // 璁惧缂栧彿
+ char name[32]; // 璁惧鍚嶇О
+ double longitude; // 璁惧鎵�鍦ㄤ綅缃紙缁忓害锛�
+ double latitude; //璁惧鎵�鍦ㄤ綅缃紙绾害锛�
+ int status; // 璁惧鐘舵�� 0锛氳澶囨甯� 1锛氳澶囧紓甯� 2锛氳澶囨崯鍧�
+ double currentEnvironment_humidity;//褰撳墠鐢熶骇鐜婀垮害
+ double currentEnvironment_temperature;//褰撳墠鐢熶骇鐜娓╁害
+};
+
+//鍏ㄩ儴璁惧鏌ヨ璇锋眰缁撴瀯浣�
+struct DeviceSelectAllReq
+{
+ Head head;
+ DeviceData dev;
+ DeviceSelectAllReq() {//鏋勯�犲嚱鏁�
+ head.type = DEVICESELECTALL_REQ;
+ head.lenth = sizeof(DeviceSelectAllReq);
+ }
+};
+
+
+//鍏ㄩ儴璁惧鏌ヨ鍝嶅簲缁撴瀯浣�
+struct DeviceSelectAllRes
+{
+ Head head;
+ int state;//0锛氭煡璇㈡垚鍔� 1锛氭煡璇㈠け璐�
+ DeviceData dev[0]; // 鏌旀�ф暟缁�
+ DeviceSelectAllRes() {
+ head.type = DEVICESELECTALL_RES;
+ head.lenth = sizeof(DeviceSelectAllRes);
+ }
+};
+//璁惧鏌ヨ璇锋眰缁撴瀯浣�
+struct DeviceSelectReq
+{
+ Head head;
+ DeviceData dev;
+ DeviceSelectReq() {//鏋勯�犲嚱鏁�
+ head.type = DEVICESELECT_REQ;
+ head.lenth = sizeof(DeviceSelectReq);
+ }
+};
+
+
+//璁惧鏌ヨ鍝嶅簲缁撴瀯浣�
+struct DeviceSelectRes
+{
+ Head head;
+ int state;//0锛氭煡璇㈡垚鍔� 1锛氭煡璇㈠け璐�
+ DeviceData dev[0]; // 鏌旀�ф暟缁�
+ DeviceSelectRes() {
+ head.type = DEVICESELECT_RES;
+ head.lenth = sizeof(DeviceSelectRes);
+ }
+};
+
+//璁惧澧炲姞璇锋眰缁撴瀯浣�
+struct DeviceAddReq
+{
+ Head head;
+ DeviceData dev;
+ DeviceAddReq() {
+ head.type = DEVICEADD_REQ;
+ head.lenth = sizeof(DeviceAddReq);
+ }
+};
+
+//璁惧澧炲姞鍝嶅簲缁撴瀯浣�
+struct DeviceAddRes
+{
+ Head head;
+ int state;//0锛氭坊鍔犳垚鍔� 1锛氬け璐�
+ DeviceAddRes() {
+ head.type = DEVICEADD_RES;
+ head.lenth = sizeof(DeviceAddRes);
+ }
+};
+
+//璁惧鍒犻櫎璇锋眰缁撴瀯浣�
+struct DeviceDeleteReq
+{
+ Head head;
+ DeviceData dev;
+ DeviceDeleteReq() {
+ head.type = DEVICEDELETE_REQ;
+ head.lenth = sizeof(DeviceDeleteReq);
+ }
+};
+
+//璁惧鍒犻櫎鍝嶅簲缁撴瀯浣�
+struct DeviceDeleteRes
+{
+ Head head;
+ int state;//0锛氬垹闄ゆ垚鍔� 1锛氬垹闄ゅけ璐�
+ DeviceDeleteRes() {
+ head.type = DEVICEDELETE_RES;
+ head.lenth = sizeof(DeviceDeleteRes);
+ }
+};
+
+
+//璁惧淇敼鏇存柊璇锋眰缁撴瀯浣�
+struct DeviceUpdateReq
+{
+ Head head;
+ DeviceData dev;
+ DeviceUpdateReq() {
+ head.type = DEVICEUPDATE_REQ;
+ head.lenth = sizeof(DeviceUpdateReq);
+ }
+};
+
+
+//璁惧淇敼鏇存柊鍝嶅簲缁撴瀯浣�
+struct DeviceUpdateRes
+{
+ Head head;
+ DeviceData dev;
+ int state;//0锛氫慨鏀规垚鍔� 1锛氫慨鏀瑰け璐�
+ DeviceUpdateRes() {
+ head.type = DEVICEUPDATE_RES;
+ head.lenth = sizeof(DeviceUpdateRes);
+ }
+};
\ No newline at end of file
diff --git "a/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.2.doc" "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.2.doc"
new file mode 100644
index 0000000..92e39bf
--- /dev/null
+++ "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.2.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040802.doc"
similarity index 74%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040802.doc"
index f5576a6..32bbb70 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040802.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
similarity index 73%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
index f5576a6..f7074db 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
similarity index 74%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
index f5576a6..32bbb70 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp" "b/Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0802.doc"
similarity index 71%
copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0802.doc"
index f5576a6..bfe5533 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
+++ "b/Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0802.doc"
Binary files differ
diff --git "a/\345\217\202\350\200\203\346\226\207\346\241\243/\351\234\200\346\261\202\345\210\206\346\236\220\346\250\241\346\235\277/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206.docx" "b/\345\217\202\350\200\203\346\226\207\346\241\243/\351\234\200\346\261\202\345\210\206\346\236\220\346\250\241\346\235\277/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206.docx"
deleted file mode 100644
index 4f2ff12..0000000
--- "a/\345\217\202\350\200\203\346\226\207\346\241\243/\351\234\200\346\261\202\345\210\206\346\236\220\346\250\241\346\235\277/\347\224\237\344\272\247\350\256\241\345\210\222\345\222\214\350\256\276\345\244\207\347\256\241\347\220\206.docx"
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0