From ea5a9a7ea7dc79e9144bb9d084d766eda6e46284 Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期五, 01 十一月 2024 12:09:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/PmsClientSocket.h | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
index df200ba..0a0e535 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.h"
@@ -6,6 +6,7 @@
#include <vector>
#include "pmsplusparam.h"
#include <QDebug>
+#include <QWidget>
using namespace std;
@@ -30,9 +31,9 @@
char permissonType[32];
QueryPmsRequest(){
head.type=QUERY_PMS_REQ;
- userNo[32] = {0};
- name[32] = {0};
- permissonType[32] = {0};
+ memset(userNo,0,32);
+ memset(permissonType,0,32);
+ memset(name,0,32);
head.len = sizeof(QueryPmsRequest);
}
} QueryPmsRequest;
@@ -54,7 +55,6 @@
// 鍗曚釜浜哄憳鏉冮檺缁撴瀯浣�
typedef struct UserAboutPms{
-
int queryHistory;
int loggerSearch;
int mapMark;
@@ -66,19 +66,18 @@
char permissonType[32];
char startDateTime[32];
char endDateTime[32];
-
} PmsRes;
// 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
typedef struct UserAboutPmsResponse{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
- PmsRes *pmsList;
+ //PmsRes pmsList[100];
+ char pmsList[0];
UserAboutPmsResponse(){
head.type=QUERY_PMS_RES;
- pmsList = (PmsRes *)malloc(sizeof(PmsRes)*100);
- pmsList = {0};
- head.len = sizeof(UserAboutPmsResponse);
+// memset(pmsList,0,sizeof(PmsRes));
+// head.len = sizeof(UserAboutPmsResponse);
}
} QueryPmsResponse;
@@ -94,7 +93,7 @@
} UpdatePmsResponse ;
-class PmsClientSocket : public QObject
+class PmsClientSocket : public QWidget
{
Q_OBJECT
@@ -106,7 +105,7 @@
bool connectSuccess= false;
public:
- PmsClientSocket(QObject * parent=0);
+ PmsClientSocket(QWidget * parent=0);
void queryAllUserAboutUser();
void queryPmsByParam(PmsParam param);
--
Gitblit v1.8.0