From a99b5cd264e65bf27f8759502cd01c976ddf995e Mon Sep 17 00:00:00 2001
From: jiangkegeng <jiangkegeng>
Date: 星期四, 07 十一月 2024 15:43:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/王琨元/code/MysqlConn.h | 63 ++++++++++++++-----------------
Server/胡家明/log/日志_胡家明_1105.doc | 0
Server/马渝杭/log/20241107昆仑日报.doc | 0
kunlun.sql | 8 ++++
Client/申烜/log/日志_申烜_1107.doc | 0
Server/胡家明/log/日志_胡家明_1106.doc | 0
Client/王鑫鑫/log/日志_王鑫鑫_1107.doc | 0
Client/冀浩昶/log/日志_冀浩昶_1107.doc | 0
Client/李宵增/log/历史查询_李宵增_1106.doc | 0
Client/刘子航/log/日志_刘子航_1107.doc | 0
Client/郑凯文/log/郑凯文1107.doc | 0
Server/马渝杭/log/日志_马渝杭_20241107.doc | 0
Client/宋昊昳/log/日志_宋昊昳_1107.doc | 0
13 files changed, 37 insertions(+), 34 deletions(-)
diff --git "a/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc" "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc"
new file mode 100644
index 0000000..fb5b723
--- /dev/null
+++ "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc"
Binary files differ
diff --git "a/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1107.doc" "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1107.doc"
new file mode 100644
index 0000000..a1d6932
--- /dev/null
+++ "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1107.doc"
Binary files differ
diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1107.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1107.doc"
new file mode 100644
index 0000000..111c811
--- /dev/null
+++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1107.doc"
Binary files differ
diff --git "a/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1106.doc" "b/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1106.doc"
new file mode 100644
index 0000000..9e4b9be
--- /dev/null
+++ "b/Client/\346\235\216\345\256\265\345\242\236/log/\345\216\206\345\217\262\346\237\245\350\257\242_\346\235\216\345\256\265\345\242\236_1106.doc"
Binary files differ
diff --git "a/Client/\347\216\213\351\221\253\351\221\253/log/\346\227\245\345\277\227_\347\216\213\351\221\253\351\221\253_1107.doc" "b/Client/\347\216\213\351\221\253\351\221\253/log/\346\227\245\345\277\227_\347\216\213\351\221\253\351\221\253_1107.doc"
new file mode 100644
index 0000000..07db227
--- /dev/null
+++ "b/Client/\347\216\213\351\221\253\351\221\253/log/\346\227\245\345\277\227_\347\216\213\351\221\253\351\221\253_1107.doc"
Binary files differ
diff --git "a/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1107.doc" "b/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1107.doc"
new file mode 100644
index 0000000..f662e30
--- /dev/null
+++ "b/Client/\347\224\263\347\203\234/log/\346\227\245\345\277\227_\347\224\263\347\203\234_1107.doc"
Binary files differ
diff --git "a/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071107.doc" "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071107.doc"
new file mode 100644
index 0000000..127f4aa
--- /dev/null
+++ "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071107.doc"
Binary files differ
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h" "b/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
index a6506d1..53bb3fc 100644
--- "a/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
+++ "b/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
@@ -2,53 +2,48 @@
#include <string>
#include <WinSock2.h>
+//#include <mysql.h>
#include "MySQL/include/mysql.h"
#include <string.h>
#include <chrono>
-#include <iostream>
-#include <memory>
-#include <queue>
-#include <mutex>
-#include <condition_variable>
-#include <regex>
+
#pragma comment(lib,"./MySQL/lib/libmysql.lib")
-using namespace std;
class MysqlConn
{
public:
- // 初始化连接
+ // 锟斤拷始锟斤拷锟斤拷锟斤拷
MysqlConn();
- // 连接数据库
- //bool connect();
- // 释放资源
- ~MysqlConn();
- // 更新数据库 ( insert update delete )
- bool update(string sql);
- // 查询数据库
- bool query(string sql, vector<vector<string>>& result);
- bool query(string sql);
- // 得到结果集
+ // 锟斤拷锟斤拷锟斤拷锟捷匡拷
+ bool connect(std::string ip, std::string userName, std::string passwd, std::string db , int port = 3306);
+ // 锟酵凤拷锟斤拷源
+ ~MysqlConn( );
+ // 锟斤拷锟斤拷锟斤拷锟捷匡拷 ( insert update delete )
+ bool update(std::string sql);
+ // 锟斤拷询锟斤拷锟捷匡拷
+ bool query(std::string sql);
+ // 锟矫碉拷锟斤拷锟斤拷锟斤拷
bool getResult();
- // 获取结果集的字段
- string getField(int index);
- // 事务操作
+ // 锟斤拷取锟斤拷锟斤拷锟斤拷锟斤拷锟街讹拷
+ std::string getField(int index);
+ // 锟斤拷锟斤拷锟斤拷锟斤拷
bool transaction();
- // 提交事务
- bool commit();
- // 事务回滚
+ // 锟结交锟斤拷锟斤拷
+ bool commit( );
+ // 锟斤拷锟斤拷锟截癸拷
bool rollback();
+ void refreshActiveTime( ); // 刷锟铰伙拷跃时锟斤拷
+ long long getActiveTime(); // 锟斤拷取锟斤拷前锟斤拷跃锟斤拷时锟斤拷锟斤拷锟斤拷
+ // 锟斤拷全校锟斤拷锟接匡拷
+ bool isSqlSafe(const std::string& sql);
- void refreshActiveTime(); // 刷新活跃时间
- long long getActiveTime(); // 获取当前活跃的时间间隔
- // 安全校验接口
- bool isSqlSafe(const string& sql);
- bool isConnected();
-protected:
+private:
+
void freeRes();
- MYSQL* m_mysql;
- MYSQL_RES* m_res;
- MYSQL_ROW m_row;
- chrono::steady_clock::time_point m_activeTime;
+ MYSQL* mysql_ = NULL ;
+ MYSQL_RES* res_ = NULL;
+ MYSQL_ROW row_ = nullptr;
+ std::chrono::steady_clock::time_point activeTime_;
};
+
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_1105.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_1105.doc"
new file mode 100644
index 0000000..dfc3f9d
--- /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_1105.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_1106.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_1106.doc"
new file mode 100644
index 0000000..346250b
--- /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_1106.doc"
Binary files differ
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/20241107\346\230\206\344\273\221\346\227\245\346\212\245.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/20241107\346\230\206\344\273\221\346\227\245\346\212\245.doc"
new file mode 100644
index 0000000..ae20b78
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/log/20241107\346\230\206\344\273\221\346\227\245\346\212\245.doc"
Binary files differ
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241107.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241107.doc"
new file mode 100644
index 0000000..22ce2b3
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241107.doc"
Binary files differ
diff --git a/kunlun.sql b/kunlun.sql
index bb9d576..32d9688 100644
--- a/kunlun.sql
+++ b/kunlun.sql
@@ -209,3 +209,11 @@
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
+<<<<<<< HEAD
+<<<<<<< HEAD
+z
+=======
+SELECT id,devices_name,longitude,latitude,devices_status FROM devices_management;
+>>>>>>> 2e420a0a40cc3fcc62bcb42ee6a25f4ad4f22dd3
+=======
+>>>>>>> d4c3d3a2b8a3e1507ca835870073df807cdb87df
--
Gitblit v1.8.0