240717班级,工业化控制系统,煤矿相关行业,昆仑系统
1
wangky
2024-11-07 781d6610681c227c6440d72794c6721e47fc13dc
1
4个文件已修改
16个文件已添加
72 ■■■■■ 已修改文件
Client/冀浩昶/log/日志_冀浩昶_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/刘子航/log/日志_刘子航_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/宋昊昳/log/日志_宋昊昳_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/朱航/log/朱航1105.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/朱航/log/朱航1106.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/李宵增/log/历史查询_李宵增_1106.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/王鑫鑫/log/日志_王鑫鑫_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/申烜/log/日志_申烜_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/郑凯文/log/郑凯文1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/黎弘霖/log/设备管理_黎弘霖_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Client/龚启祥/log/日志模板_龚启祥_1106()新.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/李转转/log/配置管理_李转转_1107.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/code/MysqlConn.h 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Server/胡家明/log/日志_胡家明_1105.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/胡家明/log/日志_胡家明_1106.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/陈楚丹/log/日志_陈楚丹_1106.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/马渝杭/log/20241107昆仑日报.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/马渝杭/log/日志_马渝杭_20241107.doc 补丁 | 查看 | 原始文档 | blame | 历史
common.h 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
kunlun.sql 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Client/¼½ºÆêÆ/log/ÈÕÖ¾_¼½ºÆêÆ_1107.doc
Binary files differ
Client/Áõ×Óº½/log/ÈÕÖ¾_Áõ×Óº½_1107.doc
Binary files differ
Client/ËÎ껕i/log/ÈÕÖ¾_ËÎ껕i_1107.doc
Binary files differ
Client/Ö캽/log/Ö캽1105.doc
Binary files differ
Client/Ö캽/log/Ö캽1106.doc
Binary files differ
Client/ÀîÏüÔö/log/ÀúÊ·²éѯ_ÀîÏüÔö_1106.doc
Binary files differ
Client/ÍõöÎöÎ/log/ÈÕÖ¾_ÍõöÎöÎ_1107.doc
Binary files differ
Client/ÉêŸ@/log/ÈÕÖ¾_ÉêŸ@_1107.doc
Binary files differ
Client/Ö£¿­ÎÄ/log/Ö£¿­ÎÄ1107.doc
Binary files differ
Client/ÀèºëÁØ/log/É豸¹ÜÀí_ÀèºëÁØ_1107.doc
Binary files differ
Client/¹¨ÆôÏé/log/ÈÕ־ģ°å_¹¨ÆôÏé_1106()ÐÂ.doc
Binary files differ
Server/Àîתת/log/ÅäÖùÜÀí_Àîתת_1107.doc
Binary files differ
Server/ÍõçûÔª/code/MysqlConn.h
@@ -2,54 +2,56 @@
#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();
<<<<<<< HEAD
    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_;
>>>>>>> eadb2439512aec3f324b6e75f09b525e8da33edb
};
Server/ºú¼ÒÃ÷/log/ÈÕÖ¾_ºú¼ÒÃ÷_1105.doc
Binary files differ
Server/ºú¼ÒÃ÷/log/ÈÕÖ¾_ºú¼ÒÃ÷_1106.doc
Binary files differ
Server/³Â³þµ¤/log/ÈÕÖ¾_³Â³þµ¤_1106.doc
Binary files differ
Server/ÂíÓ庼/log/20241107À¥ÂØÈÕ±¨.doc
Binary files differ
Server/ÂíÓ庼/log/ÈÕÖ¾_ÂíÓ庼_20241107.doc
Binary files differ
common.h
@@ -325,7 +325,7 @@
struct MDReq//修改请求
{
    Head head;
    DevicesInfo info;
    MDReq() {
        head.type = MD_REQ;
        head.len = sizeof(MDReq);
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