From 6413172ba34acc25557150458200a23d92801fce Mon Sep 17 00:00:00 2001
From: tian <2056135266@qq.com>
Date: 星期日, 29 六月 2025 15:18:40 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/智能网联_25-0305_617_v1
---
Client/于文龙/log/日志-于文龙-250625.doc | 0
Server/汪卫军/code/ImageStorage.h | 17 ++++++++
Server/王鹏哲/log/日志_王鹏哲_20250626.doc | 0
Server/汪卫军/code/ImageStorage.cpp | 54 +++++++++++++++++++++++++++
Server/梁博/log/日志_梁博_0625.doc | 0
Client/徐蔓云/log/日志_徐蔓云_0626.doc | 0
Client/王国壮/document/~$实时环境信息展示.xlsx | 0
Server/徐逸凡/log/日志_徐逸凡_250625.doc | 0
Server/common_type.h | 22 +++++-----
Client/杨高权/document/日志_杨高权_250625 .doc | 0
/dev/null | 0
Server/梁博/log/~WRL0005.tmp | 0
Client/舒海林/log/日志_舒海林_0625.doc | 0
Server/梁博/log/~$_梁博_0624.doc | 0
蚂蚁智能网联项目分工表.xlsx | 0
Client/魏强/log/~$_魏强_0626.doc | 0
Server/刘斌/log/日志_刘斌_20250625.doc | 0
Client/杨高权/log/日志_杨高权_250625 .doc | 0
Server/王鹏哲/log/日志_王鹏哲_20250627.doc | 0
Server/汪卫军/log/日志_汪卫军_0625.doc | 0
蚂蚁智能网联项目计划表.xlsx | 0
Client/魏强/log/日志_魏强_0626.doc | 0
Client/牛彦江/log/日志_牛彦江_250625.doc | 0
Client/于文龙/log/日志-于文龙-250627.doc | 0
24 files changed, 82 insertions(+), 11 deletions(-)
diff --git "a/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250625.doc" "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250625.doc"
new file mode 100644
index 0000000..b56bc7a
--- /dev/null
+++ "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250625.doc"
Binary files differ
diff --git "a/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250627.doc" "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250627.doc"
new file mode 100644
index 0000000..36fd2f0
--- /dev/null
+++ "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250627.doc"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0626.doc"
similarity index 68%
copy from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
copy to "Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0626.doc"
index f846480..4aa62aa 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0626.doc"
Binary files differ
diff --git "a/Client/\346\235\250\351\253\230\346\235\203/document/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc" "b/Client/\346\235\250\351\253\230\346\235\203/document/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
new file mode 100644
index 0000000..c5c09ee
--- /dev/null
+++ "b/Client/\346\235\250\351\253\230\346\235\203/document/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
Binary files differ
diff --git "a/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc" "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
index b03727c..c5c09ee 100644
--- "a/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
+++ "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
Binary files differ
diff --git "a/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250625.doc" "b/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250625.doc"
new file mode 100644
index 0000000..f21c8c4
--- /dev/null
+++ "b/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250625.doc"
Binary files differ
diff --git "a/Client/\347\216\213\345\233\275\345\243\256/document/~$\345\256\236\346\227\266\347\216\257\345\242\203\344\277\241\346\201\257\345\261\225\347\244\272.xlsx" "b/Client/\347\216\213\345\233\275\345\243\256/document/~$\345\256\236\346\227\266\347\216\257\345\242\203\344\277\241\346\201\257\345\261\225\347\244\272.xlsx"
new file mode 100644
index 0000000..7227f8f
--- /dev/null
+++ "b/Client/\347\216\213\345\233\275\345\243\256/document/~$\345\256\236\346\227\266\347\216\257\345\242\203\344\277\241\346\201\257\345\261\225\347\244\272.xlsx"
Binary files differ
diff --git "a/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0625.doc" "b/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0625.doc"
new file mode 100644
index 0000000..b0b54ff
--- /dev/null
+++ "b/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0625.doc"
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc" "b/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc"
new file mode 100644
index 0000000..035e78c
--- /dev/null
+++ "b/Client/\351\255\217\345\274\272/log/~$_\351\255\217\345\274\272_0626.doc"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0626.doc"
similarity index 61%
copy from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
copy to "Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0626.doc"
index f846480..8beb1db 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0626.doc"
Binary files differ
diff --git a/Server/common_type.h b/Server/common_type.h
index 68ac3f8..f9524ae 100644
--- a/Server/common_type.h
+++ b/Server/common_type.h
@@ -1,6 +1,6 @@
#ifndef TCPDATATYPE_H
#define TCPDATATYPE_H
-/*请求类型*/
+/* */
enum class ActionType
{
HeartCheck = 100,
@@ -9,18 +9,18 @@
Msg = 200,
Download = 300
};
-/*参考HTTP的响应码*/
+/* 慰 HTTP 应 */
enum class ResponseCode
{
- ResponseOK = 200, // 请求成功。
- BadRequest = 400, // 客户端请求的语法错误，服务器无法理解
- Unauthorized = 401, // 请求要求用户的身份认证
- Forbidden = 403, // 服务器理解请求客户端的请求，但是拒绝执行此请求
- NotFound = 404, // 服务器无法找到请求的资源
- MethodNotAllowed = 405 // 客户端请求中的方法被禁止
+ ResponseOK = 200, // 晒
+ BadRequest = 400, // 突 螅 薹
+ Unauthorized = 401, // 要 没 证
+ Forbidden = 403, // 突 说 螅 蔷芫 执 写
+ NotFound = 404, // 薹 业 源
+ MethodNotAllowed = 405 // 突 械姆 止
};
-/*消息体*/
+/* 息 */
struct Head
{
ActionType type;
@@ -33,7 +33,7 @@
version = pversion;
}
};
-struct HeartCheckReq // 心跳请求包
+struct HeartCheckReq //
{
ActionType type;
int len;
@@ -44,7 +44,7 @@
}
};
-struct HeartCheckRes // 心跳响应包
+struct HeartCheckRes // 应
{
ActionType type;
int len;
diff --git "a/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc" "b/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc"
deleted file mode 100644
index d372c3b..0000000
--- "a/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc"
+++ /dev/null
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250625.doc"
similarity index 71%
copy from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
copy to "Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250625.doc"
index f846480..ca18304 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250625.doc"
Binary files differ
diff --git "a/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250625.doc" "b/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250625.doc"
new file mode 100644
index 0000000..d63190f
--- /dev/null
+++ "b/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250625.doc"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc" "b/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc"
new file mode 100644
index 0000000..7cf3296
--- /dev/null
+++ "b/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Server/\346\242\201\345\215\232/log/~WRL0005.tmp"
similarity index 73%
copy from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
copy to "Server/\346\242\201\345\215\232/log/~WRL0005.tmp"
index f846480..17190ff 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Server/\346\242\201\345\215\232/log/~WRL0005.tmp"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.doc"
similarity index 78%
rename from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
rename to "Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.doc"
index f846480..1ee7837 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.doc"
Binary files differ
diff --git "a/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.cpp" "b/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.cpp"
new file mode 100644
index 0000000..b43bc2e
--- /dev/null
+++ "b/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.cpp"
@@ -0,0 +1,54 @@
+// ImageStorage.cpp - 照片存储模块实现
+#include "stdafx.h"
+#include "ImageStorage.h"
+#include <fstream>
+#include <opencv2/opencv.hpp>
+
+ImageStorage::ImageStorage() {}
+
+ImageStorage::~ImageStorage() {}
+
+bool ImageStorage::SaveImage(const std::string& filePath, const unsigned char* imageData,
+ int width, int height) {
+ try {
+ // 创建OpenCV图像
+ cv::Mat image(height, width, CV_8UC3, const_cast<unsigned char*>(imageData));
+
+ // 保存图像
+ return cv::imwrite(filePath, image);
+ }
+ catch (const std::exception& e) {
+ std::cerr << "保存图像失败: " << e.what() << std::endl;
+ return false;
+ }
+}
+
+bool ImageStorage::LoadImage(const std::string& filePath, unsigned char*& imageData,
+ int& width, int& height) const {
+ try {
+ // 加载图像
+ cv::Mat image = cv::imread(filePath, cv::IMREAD_COLOR);
+
+ if (image.empty()) {
+ return false;
+ }
+
+ // 分配内存并复制数据
+ width = image.cols;
+ height = image.rows;
+ size_t dataSize = width * height * 3;
+
+ imageData = new unsigned char[dataSize];
+ memcpy(imageData, image.data, dataSize);
+
+ return true;
+ }
+ catch (const std::exception& e) {
+ std::cerr << "加载图像失败: " << e.what() << std::endl;
+ return false;
+ }
+}
+
+bool ImageStorage::DeleteImage(const std::string& filePath) {
+ return (remove(filePath.c_str()) == 0);
+}
\ No newline at end of file
diff --git "a/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.h" "b/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.h"
new file mode 100644
index 0000000..3b754d6
--- /dev/null
+++ "b/Server/\346\261\252\345\215\253\345\206\233/code/ImageStorage.h"
@@ -0,0 +1,17 @@
+// ImageStorage.h - 照片存储模块
+#pragma once
+#include <string>
+#include <vector>
+#include "FaceImageManager.h"
+
+class ImageStorage {
+public:
+ ImageStorage();
+ ~ImageStorage();
+
+ bool SaveImage(const std::string& filePath, const unsigned char* imageData,
+ int width, int height);
+ bool LoadImage(const std::string& filePath, unsigned char*& imageData,
+ int& width, int& height) const;
+ bool DeleteImage(const std::string& filePath);
+};
\ No newline at end of file
diff --git "a/Server/\346\261\252\345\215\253\345\206\233/code/\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.doc" "b/Server/\346\261\252\345\215\253\345\206\233/code/\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.doc"
deleted file mode 100644
index f4b04c3..0000000
--- "a/Server/\346\261\252\345\215\253\345\206\233/code/\351\234\200\346\261\202\345\210\206\346\236\220\346\226\207\346\241\243.doc"
+++ /dev/null
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Server/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc"
similarity index 65%
copy from "Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
copy to "Server/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc"
index f846480..bc22d97 100644
--- "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
+++ "b/Server/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc"
Binary files differ
diff --git "a/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250626.doc" "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250626.doc"
new file mode 100644
index 0000000..8ef9ef6
--- /dev/null
+++ "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250626.doc"
Binary files differ
diff --git "a/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250627.doc" "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250627.doc"
new file mode 100644
index 0000000..4ab3a08
--- /dev/null
+++ "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250627.doc"
Binary files differ
diff --git "a/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\345\210\206\345\267\245\350\241\250.xlsx" "b/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\345\210\206\345\267\245\350\241\250.xlsx"
index 9694156..ce7272c 100644
--- "a/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\345\210\206\345\267\245\350\241\250.xlsx"
+++ "b/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\345\210\206\345\267\245\350\241\250.xlsx"
Binary files differ
diff --git "a/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx" "b/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx"
new file mode 100644
index 0000000..f959e4c
--- /dev/null
+++ "b/\350\232\202\350\232\201\346\231\272\350\203\275\347\275\221\350\201\224\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx"
Binary files differ
--
Gitblit v1.8.0