From 027317737976773e87b0e2a3bdf2030d4946ec48 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:55:36 +0800
Subject: [PATCH] 用户登录后，返回用户值对象中增加用户id
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java
index ca88a20..2bbe053 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java
@@ -8,9 +8,11 @@
import com.dy.testServer.ServerProperties;
public class Manager {
-
- public static boolean enablemwTestStart = false ;
-
+
+ public static boolean enablemwTestStartTcpConnect = false ;
+
+ public static boolean enablemwTestStartRtuReport = false ;
+
public static int clientId = 1 ;
public static long maxClient = 0 ;
@@ -79,10 +81,12 @@
}else if(rqVo.code.equals(Code.cd3)){
resVo.obj = doDealGetStart(rqVo) ;
}else if(rqVo.code.equals(Code.cd4)){
- doDealReportCount(rqVo) ;
+ resVo.obj = doDealGetReport(rqVo) ;
}else if(rqVo.code.equals(Code.cd5)){
- doDealReportOver(rqVo) ;
+ doDealReportCount(rqVo) ;
}else if(rqVo.code.equals(Code.cd6)){
+ doDealReportOver(rqVo) ;
+ }else if(rqVo.code.equals(Code.cd7)){
doDealAllOver(rqVo) ;
}
return resVo ;
@@ -127,9 +131,9 @@
}
return conVo ;
}
- private static ResStartVo doDealGetStart(RmiRequestVo rqVo){
- ResStartVo rvo = new ResStartVo() ;
- rvo.start = enablemwTestStart ;
+ private static ResStartTcpConnectVo doDealGetStart(RmiRequestVo rqVo){
+ ResStartTcpConnectVo rvo = new ResStartTcpConnectVo() ;
+ rvo.start = enablemwTestStartTcpConnect ;
int token = Integer.parseInt(rqVo.token) ;
MwTestClientStatus sta = token2ClientMap.get("" + token);
if(sta == null){
@@ -141,7 +145,21 @@
}
return rvo ;
}
-
+ private static ResStartRtuReportVo doDealGetReport(RmiRequestVo rqVo){
+ ResStartRtuReportVo rvo = new ResStartRtuReportVo() ;
+ rvo.report = enablemwTestStartRtuReport ;
+ int token = Integer.parseInt(rqVo.token) ;
+ MwTestClientStatus sta = token2ClientMap.get("" + token);
+ if(sta == null){
+ sta = new MwTestClientStatus() ;
+ sta.reportVo = rvo ;
+ token2ClientMap.put("" + token, sta);
+ }else{
+ sta.reportVo = rvo ;
+ }
+ return rvo ;
+ }
+
private static void doDealReportCount(RmiRequestVo rqVo){
int token = Integer.parseInt(rqVo.token) ;
@@ -161,10 +179,10 @@
MwTestClientStatus sta = token2ClientMap.get("" + token);
if(sta == null){
sta = new MwTestClientStatus() ;
- sta.overCount = rqVo.count ;
+ sta.overCount = rqVo.overCount ;
token2ClientMap.put("" + token, sta);
}else{
- sta.count = rqVo.count ;
+ sta.overCount = rqVo.overCount ;
}
}
--
Gitblit v1.8.0