From 84182fbb85e7c11194014a8ca9d25a97f4f088e4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 29 七月 2024 13:49:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java
index 30d32b0..f60c73a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java
@@ -13,11 +13,11 @@
public static void onOffLine(RtuSessionStatus sta){
- StOnOffLine st = new StOnOffLine() ;
- st.rtuAddr = sta.rtuAddr ;
- st.onOff_trueFalse = sta.onTrueOffLine ;
- st.ip = sta.ip ;
- st.port = sta.port ;
+// StOnOffLine st = new StOnOffLine() ;
+// st.rtuAddr = sta.rtuAddr ;
+// st.onOff_trueFalse = sta.onTrueOffLine ;
+// st.ip = sta.ip ;
+// st.port = sta.port ;
// if(member == null){
// log.error("鍑洪敊锛屾湭鑳藉緱鍒板鐞哛TU锛堝湴鍧�涓�" + sta.rtuAddr + "锛夌姸鎬佹暟鎹殑鏁版嵁涓棿浠讹紝鍙兘鏁版嵁涓棿浠舵湭鍚姩鎴栬劚绂荤殑闆嗙兢锛�");
@@ -28,11 +28,11 @@
}
public static void onLine(String rtuAddr, String ip, Integer port){
- StOnOffLine st = new StOnOffLine() ;
- st.rtuAddr = rtuAddr ;
- st.onOff_trueFalse = true ;
- st.ip = ip ;
- st.port = port ;
+// StOnOffLine st = new StOnOffLine() ;
+// st.rtuAddr = rtuAddr ;
+// st.onOff_trueFalse = true ;
+// st.ip = ip ;
+// st.port = port ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -44,9 +44,9 @@
}
public static void offLine(String rtuAddr){
- StOnOffLine st = new StOnOffLine() ;
- st.rtuAddr = rtuAddr ;
- st.onOff_trueFalse = false ;
+// StOnOffLine st = new StOnOffLine() ;
+// st.rtuAddr = rtuAddr ;
+// st.onOff_trueFalse = false ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -58,10 +58,10 @@
}
public static void upData(String rtuAddr, Integer bufferLen){
- StUpData st = new StUpData() ;
- st.rtuAddr = rtuAddr ;
- st.upBufferLen = bufferLen ;
- st.isReport = false ;
+// StUpData st = new StUpData() ;
+// st.rtuAddr = rtuAddr ;
+// st.upBufferLen = bufferLen ;
+// st.isReport = false ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -73,10 +73,10 @@
}
public static void upReport(String rtuAddr, Integer bufferLen){
- StUpData st = new StUpData() ;
- st.rtuAddr = rtuAddr ;
- st.upBufferLen = bufferLen ;
- st.isReport = true ;
+// StUpData st = new StUpData() ;
+// st.rtuAddr = rtuAddr ;
+// st.upBufferLen = bufferLen ;
+// st.isReport = true ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -88,9 +88,9 @@
}
public static void downData(String rtuAddr, Integer bufferLen){
- StDownData st = new StDownData() ;
- st.rtuAddr = rtuAddr ;
- st.downBufferLen = bufferLen ;
+// StDownData st = new StDownData() ;
+// st.rtuAddr = rtuAddr ;
+// st.downBufferLen = bufferLen ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -102,9 +102,9 @@
}
public static void commandSuccess(String rtuAddr){
- StCommandResult st = new StCommandResult() ;
- st.rtuAddr = rtuAddr ;
- st.isSuccess = true ;
+// StCommandResult st = new StCommandResult() ;
+// st.rtuAddr = rtuAddr ;
+// st.isSuccess = true ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -116,9 +116,9 @@
}
public static void commandFailure(String rtuAddr){
- StCommandResult st = new StCommandResult() ;
- st.rtuAddr = rtuAddr ;
- st.isSuccess = false ;
+// StCommandResult st = new StCommandResult() ;
+// st.rtuAddr = rtuAddr ;
+// st.isSuccess = false ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
@@ -130,9 +130,9 @@
}
public static void commandFail2Success(String rtuAddr){
- StCommandResult st = new StCommandResult() ;
- st.rtuAddr = rtuAddr ;
- st.fail2Success = true ;
+// StCommandResult st = new StCommandResult() ;
+// st.rtuAddr = rtuAddr ;
+// st.fail2Success = true ;
// Address member = JgUnit.getInstance().getJgMembers().getDataMwMemberByRtuAddr(rtuAddr) ;
// if(member == null){
--
Gitblit v1.8.0