From 31037e4ce8e0f45d4058184d60b358b5eadb50e1 Mon Sep 17 00:00:00 2001
From: congmu <congmu2024@163.com>
Date: 星期三, 06 十一月 2024 15:00:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/PmsClientSocket.h | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 0a0e535..3a17733 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"
@@ -16,7 +16,7 @@
};
enum option{
- QUERY_PMS_REQ,
+ QUERY_PMS_REQ=6,
UPDATE_PMS_REQ,
QUERY_PMS_RES,
UPDATE_PMS_RES,
@@ -24,73 +24,84 @@
// 鎸夊憳宸ョ紪鍙枫�佸悕瀛楁垨鑱屼綅鏌ヨ浜哄憳鏉冮檺淇℃伅璇锋眰
-typedef struct QueryPmsRequest{
+typedef struct QueryPmsReq{
Head head;
char userNo[32];
char name[32];
char permissonType[32];
- QueryPmsRequest(){
+ QueryPmsReq(){
head.type=QUERY_PMS_REQ;
memset(userNo,0,32);
memset(permissonType,0,32);
memset(name,0,32);
- head.len = sizeof(QueryPmsRequest);
+ head.len = sizeof(QueryPmsReq);
}
-} QueryPmsRequest;
+} QueryPmsReq;
// 鎸夎鑹瞚d鏇存柊鏉冮檺淇℃伅璇锋眰
-typedef struct UpdatePmsRequest{
+typedef struct UpdatePmsReq{
Head head;
- int roleId;
+ // 浜哄憳琛ㄤ富閿甶d
+ int id;
int queryHistory;
int loggerSearch;
int mapMark;
int devManage;
int productPlan;
- UpdatePmsRequest(){
- head.type=QUERY_PMS_RES;
- head.len = sizeof(UpdatePmsRequest);
- }
-} UpdatePmsRequest;
+ int warningManage;
+ int versionManage; //鐗堟湰绠＄悊
+ int admin; //绯荤粺绠＄悊鍛�
-// 鍗曚釜浜哄憳鏉冮檺缁撴瀯浣�
-typedef struct UserAboutPms{
+ char permissonType[32];
+ UpdatePmsReq(){
+ head.type=UPDATE_PMS_REQ;
+ head.len = sizeof(UpdatePmsReq);
+ }
+} UpdatePmsReq;
+
+// 鍗曚釜浜哄憳鍜屾潈闄愯仈鍚堟煡璇㈢粨鏋勪綋
+typedef struct PmsRes{
int queryHistory;
int loggerSearch;
int mapMark;
int devManage;
int productPlan;
- int roleId;
+ int versionManage; //鐗堟湰绠＄悊
+ int warningManage;
+ int admin; //绯荤粺绠＄悊鍛�
+
+ int id;
+
char userNo[32];
char name[32];
- char permissonType[32];
- char startDateTime[32];
- char endDateTime[32];
+
+ char permissonType[32]; // 瑙掕壊绫诲瀷
+
+ char department[32];
+ char loginTime[32];
+ char registerTime[32];
} PmsRes;
// 鏌ヨ浜哄憳鍜岃鑹蹭俊鎭殑鍝嶅簲缁撴瀯浣�
-typedef struct UserAboutPmsResponse{
+typedef struct QueryPmsRes{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
- //PmsRes pmsList[100];
- char pmsList[0];
- UserAboutPmsResponse(){
+ PmsRes pmsList[0];
+ QueryPmsRes(){
head.type=QUERY_PMS_RES;
-// memset(pmsList,0,sizeof(PmsRes));
-// head.len = sizeof(UserAboutPmsResponse);
}
-} QueryPmsResponse;
+} QueryPmsRes;
// 鏉冮檺鏇存柊缁撴灉鍝嶅簲浣�
-typedef struct UpdatePmsResponse{
+typedef struct UpdatePmsRes{
Head head;
int success; // 1涓烘垚鍔� ,0涓哄け璐�
- UpdatePmsResponse(){
+ UpdatePmsRes(){
head.type = UPDATE_PMS_RES;
- head.len = sizeof(UpdatePmsResponse);
+ head.len = sizeof(UpdatePmsRes);
}
-} UpdatePmsResponse ;
+} UpdatePmsRes ;
class PmsClientSocket : public QWidget
@@ -99,7 +110,7 @@
QTcpSocket *client;
- int port=88888;
+ int port=16888;
QString targetIp = "127.0.0.1";
bool connectSuccess= false;
--
Gitblit v1.8.0