240717班级,工业化控制系统,煤矿相关行业,昆仑系统
jhc
2024-11-01 bb11cc624ab058fc3a6541f91f37985b8caae9b6
Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
Please enter a commit message to explain why this merge is necessary,
2个文件已修改
6个文件已添加
1 文件已重命名
3个文件已删除
148 ■■■■ 已修改文件
Client/黎弘霖/code/Devices_Management_Struct.h 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Client/黎弘霖/log/设备管理_黎弘霖_1101.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/document/~$表.docx 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/document/备份导出.txt 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/document/建表.docx 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/document/表.docx 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/document/防注入.txt 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Server/王琨元/log/日志模板_王琨元_1031 .doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/马渝杭/log/20241101昆仑日报.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/马渝杭/log/日志_马渝杭_20241031.doc 补丁 | 查看 | 原始文档 | blame | 历史
Server/马渝杭/log/日志_马渝杭_20241101.doc 补丁 | 查看 | 原始文档 | blame | 历史
common.h 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Client/黎弘霖/code/Devices_Management_Struct.h
@@ -3,8 +3,8 @@
{
    AD_Req,//娣诲姞璁惧璇锋眰
    AD_Res,//娣诲姞璁惧鍝嶅簲
    DD_Req,//鍏抽棴璁惧璇锋眰
    DD_Res,//鍏抽棴璁惧璇锋眰
    CD_Req,//鍏抽棴璁惧璇锋眰
    CD_Res,//鍏抽棴璁惧璇锋眰
    PD_Req,//鏆傚仠璁惧璇锋眰
    PD_Res,//鏆傚仠璁惧璇锋眰
};
@@ -29,15 +29,22 @@
{
    char Device_Name[32];
    char Device_Status[32];
    char Start_Time[32];
    char Work_Time[32];
    char Manufacturer[100];
    char Devices_Type[32];
    double Longitude;
    double Latitude;
};
struct ADRes
{
    Head head;
    char Device_Name[32];
    char Device_Status[32];
    char Start_Time[32];
    char Work_Time[32];
    char Manufacturer[100];
    char Devices_Type[32];
    double Longitude;
    double Latitude;
    ADPermission per;
    ADRes() {
        head.type = AD_Res;
@@ -47,16 +54,16 @@
};
//鍏抽棴璁惧
struct DDReq
struct CDReq
{
    Head head;
    char Device_Name[32];
    DDReq() {
        head.type = DD_Req;
        head.len = sizeof(DDReq);
    CDReq() {
        head.type = CD_Req;
        head.len = sizeof(CDReq);
    }
};
struct DDPermission
struct CDPermission
{
    char Device_Name[32];
    char Device_Status[32];
@@ -64,15 +71,18 @@
    char Work_Time[32];
    char Manufacturer[100];
    char Devices_Type[32];
    double Longitude;
    double Latitude;
};
struct DDRes
struct CDRes
{
    Head head;
    DDPermission per;
    DDRes() {
        head.type = DD_Res;
        head.len = sizeof(DDRes);
    char Device_Status[32];
    int status;
    CDPermission per;
    CDRes() {
        head.type = CD_Res;
        head.len = sizeof(CDRes);
    }
};
@@ -94,11 +104,15 @@
    char Work_Time[32];
    char Manufacturer[100];
    char Devices_Type[32];
    double Longitude;
    double Latitude;
};
struct PDRes
{
    Head head;
    char Device_Status[32];
    char Work_Time[32];
    int status;
    PDPermission per;
    PDRes() {
        head.type = PD_Res;
Client/黎弘霖/log/设备管理_黎弘霖_1101.doc
Binary files differ
Server/王琨元/document/~$表.docx
Binary files differ
Server/王琨元/document/备份导出.txt
File was deleted
Server/王琨元/document/建表.docx
Binary files differ
Server/王琨元/document/表.docx
Binary files differ
Server/王琨元/document/防注入.txt
File was deleted
Server/王琨元/log/日志模板_王琨元_1031 .doc
Binary files differ
Server/马渝杭/log/20241101昆仑日报.doc
Binary files differ
Server/马渝杭/log/日志_马渝杭_20241031.doc
Binary files differ
Server/马渝杭/log/日志_马渝杭_20241101.doc
Binary files differ
common.h
@@ -1,9 +1,7 @@
#ifndef COMMON_H
#define COMMON_H
#include <iostream>
#include <cstring>
#include <QString>
#include <string.h>
enum TypeInfo{