Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

Administrator

2024-11-08 4f045ac9062517afb8b0bbeb11f9758938725516

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

 Client/Áõ×Óº½/log/ÈÕÖ¾_Áõ×Óº½_1108.doc

Binary files differ

 Client/Ö캽/code/kunlunclient/clientmainwindow.cpp

File was deleted

 Client/Ö캽/code/kunlunclient/clientmainwindow.h

File was deleted

 Client/Ö캽/code/kunlunclient/clientmainwindow.ui

File was deleted

 Client/Ö캽/code/kunlunclient/common.h

File was deleted

 Client/Ö캽/code/kunlunclient/kunlunclient.pro

File was deleted

 Client/Ö캽/code/kunlunclient/kunlunclient.pro.user

File was deleted

 Client/Ö캽/code/kunlunclient/logquery.cpp

File was deleted

 Client/Ö캽/code/kunlunclient/logquery.h

File was deleted

 Client/Ö캽/code/kunlunclient/logquery.ui

File was deleted

 Client/Ö캽/code/kunlunclient/main.cpp

File was deleted

 Client/Ö캽/code/·þÎñ¶Ë/LogSearch.cpp

File was deleted

 Client/Ö캽/code/·þÎñ¶Ë/LogSearch.h

File was deleted

 Client/ÀîÏüÔö/log/ÀúÊ·²éѯ_ÀîÏüÔö_1106.doc

Binary files differ

 Client/ÀîÏüÔö/log/ÀúÊ·²éѯ_ÀîÏüÔö_1107.doc

Binary files differ

 Server/Àîתת/log/ÅäÖùÜÀí_Àîתת_1108.doc

Binary files differ

 Server/ÍõçûÔª/code/MysqlConn.cpp

@@ -11,8 +11,6 @@
        cout << "Failed to initialize MySQL." << endl;
        return;
    }
    // è®¾ç½®å­—符集
    if (m_mysql) mysql_set_character_set(m_mysql, "gbk");
    // ä½¿ç”¨å†™æ­»çš„参数连接数据库
    m_mysql = mysql_real_connect(m_mysql, "127.0.0.1", "root", "123456", "mayi_kunlun", 3306, nullptr, 0);
    if (!m_mysql) {
@@ -22,25 +20,13 @@
        m_mysql = nullptr;
    }
    // åˆå§‹åŒ– row_ å’Œ res_
    if (m_mysql) mysql_set_character_set(m_mysql, "gbk");
    m_row = nullptr;
    m_res = nullptr;
}
bool MysqlConn::isConnected() {
    return m_mysql != nullptr;
}
// è¿žæŽ¥æ•°æ®åº“
//bool MysqlConn::connect() {
//    string ip = "127.0.0.1";
//    string userName = "root";
//    string passwd = "123456";
//    string db = "mayi_kunlun";
//    int port = 3306;
//    m_mysql = mysql_real_connect(mysql_, ip.c_str(), userName.c_str(), passwd.c_str(), db.c_str(), port, nullptr, 0);
//    if (!m_mysql) {
//        return false;
//    }
//    return true;
//}

// é‡Šæ”¾èµ„源
MysqlConn::~MysqlConn() {
@@ -64,7 +50,6 @@
    }
    int paramCount = mysql_stmt_param_count(stmt);
    if (paramCount > 0) {
        // å¦‚果有参数，需要进行参数绑定等操作，这里暂不实现
        mysql_stmt_close(stmt);
        return false;
    }
@@ -91,6 +76,7 @@
    //int col_cnt = m_mysql->field_count;
    int col_cnt = mysql_field_count(m_mysql);
    cout << col_cnt << endl;
    MYSQL_ROW m_row;
    while (m_row = mysql_fetch_row(m_res)) {
        vector<string> tmp;
        for (int i = 0; i < col_cnt; i++) {

 Server/ÍõçûÔª/code/MysqlConn.h

@@ -2,56 +2,54 @@

#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(std::string ip, std::string userName, std::string passwd, std::string db , int port = 3306);
    // ï¿½Í·ï¿½ï¿½ï¿½Ô´
    // è¿žæŽ¥æ•°æ®åº“
    //bool connect();
    // é‡Šæ”¾èµ„源
    ~MysqlConn( );
    // ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ý¿ï¿½  ( insert  update delete )
    bool update(std::string sql);
    // ï¿½ï¿½Ñ¯ï¿½ï¿½ï¿½Ý¿ï¿½
    bool query(std::string sql);
    // ï¿½Ãµï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
    // æ›´æ–°æ•°æ®åº“  ( insert  update delete )
    bool update(string sql);
    // æŸ¥è¯¢æ•°æ®åº“
    bool query(string sql, vector<vector<string>>& result);
    bool query(string sql);
    // å¾—到结果集
    bool getResult();
    // ï¿½ï¿½È¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ö¶ï¿½
    std::string getField(int index);
    // ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
    // èŽ·å–结果集的字段
    string getField(int index);
    // äº‹åŠ¡æ“ä½œ
    bool transaction();
    // ï¿½á½»ï¿½ï¿½ï¿½ï¿½
    // æäº¤äº‹åŠ¡
    bool commit( );
    // ï¿½ï¿½ï¿½ï¿½ï¿½Ø¹ï¿½
    // äº‹åŠ¡å›žæ»š
    bool rollback();

    void refreshActiveTime( );   // Ë¢ï¿½Â»ï¿½Ô¾Ê±ï¿½ï¿½
    long long getActiveTime();   // ï¿½ï¿½È¡ï¿½ï¿½Ç°ï¿½ï¿½Ô¾ï¿½ï¿½Ê±ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 
    // ï¿½ï¿½È«Ð£ï¿½ï¿½ï¿½Ó¿ï¿½
    bool isSqlSafe(const std::string& sql);

private:

    void refreshActiveTime();   // åˆ·æ–°æ´»è·ƒæ—¶é—´
    long long getActiveTime();   // èŽ·å–当前活跃的时间间隔 
    // å®‰å…¨æ ¡éªŒæŽ¥å£
    bool isSqlSafe(const string& sql);
    bool isConnected();
protected:
    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/ÈÕ־ģ°å_ÍõçûÔª_1107.doc

Binary files differ

 kunlun.sql

@@ -44,21 +44,22 @@
  `area` varchar(50) DEFAULT NULL,
  `longitude` double DEFAULT NULL,
  `latitude` double DEFAULT NULL,
  `purchasing_time` varchar(50) DEFAULT NULL,
  `install_time` varchar(50) DEFAULT NULL,
  `purchasing_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
  `install_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
  `manufacturer` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
  `mark_name` varchar(50) DEFAULT NULL,
  `mark_time` varchar(50) DEFAULT NULL,
  `mark_status` int DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

-- æ­£åœ¨å¯¼å‡ºè¡¨  mayi_kunlun.devices_management_info çš„数据：~5 rows (大约)
INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_name`, `mark_time`) VALUES
-- æ­£åœ¨å¯¼å‡ºè¡¨  mayi_kunlun.devices_management_info çš„数据：~6 rows (大约)
INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_time`, `mark_status`) VALUES
    (6, '6', '6', '6', '6', '8', 8, 8, '8', '8', '8', NULL, NULL),
    (7, '1', '4', '4', '2', '6', 6, 9, '9', '2', '2', NULL, NULL),
    (8, '1', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL),
    (9, '10', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL),
    (10, '6', '5', '5', '5', '5', 5, 5, '5', '5', '5', NULL, NULL);
    (10, '6', '5', '5', '5', '5', 5, 5, '5', '5', '5', NULL, NULL),
    (12, '312', '231', '324', '1321', '312', 312, 321, '2024-01-01', '2024-01-01', '3124', NULL, NULL);

-- å¯¼å‡º  è¡¨ mayi_kunlun.month_info ç»“æž„
CREATE TABLE IF NOT EXISTS `month_info` (
@@ -143,7 +144,7 @@
  `id` int NOT NULL AUTO_INCREMENT,
  `department` varchar(50) DEFAULT NULL,
  `user_name` varchar(32) DEFAULT NULL,
  `password` varchar(32) DEFAULT NULL,
  `password` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
  `user_no` varchar(10) DEFAULT NULL,
  `age` int DEFAULT NULL,
  `sex` varchar(10) DEFAULT NULL,
@@ -154,6 +155,7 @@
  `login_time` datetime DEFAULT NULL,
  `register_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `unique_constraint_name` (`user_name`),
  KEY `role_id` (`role_id`),
  CONSTRAINT `user_info_ibfk_1` FOREIGN KEY (`role_id`) REFERENCES `role_info` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
@@ -209,11 +211,3 @@
/*!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

 ±í.docx

Binary files differ