From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
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