From dd694b8a3d05e2d785413182e1c28b25a5b3f431 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 20 十二月 2023 17:24:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
index 410f43c..16a4852 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
@@ -7,9 +7,9 @@
import com.dy.common.mw.protocol.MidResult;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Driver;
-import com.dy.common.mw.protocol.ProtocolCach;
+import com.dy.common.mw.protocol.ProtocolCache;
import com.dy.aceMw.server.ServerProperties;
-import com.dy.aceMw.server.forTcp.TcpSessionCach;
+import com.dy.aceMw.server.forTcp.TcpSessionCache;
/**
* 浠巜eb涓氬姟绯荤粺鍙戝悜RTU鐨勫懡浠や换鍔�
@@ -21,7 +21,7 @@
private static Logger log = LogManager.getLogger(RtuDownTask.class.getName());
@Override
- public Integer excute() {
+ public Integer execute() {
Command com = (Command)this.data ;
try {
log.info("涓嬪彂杩滅▼鍛戒护" + com.getCode() + "鐨勬牳蹇冧换鍔″紑濮嬫墽琛�");
@@ -34,24 +34,23 @@
/**
* 澶勭悊鍛戒护
- * @param webJgroupName
- * @param com
+ * @param com 鍛戒护
* @throws Exception
*/
private void deal(Command com) throws Exception{
String rtuAddr = com.getRtuAddr() ;
//鍓嶉潰宸茬粡鍒ゆ柇rtuAddr涓虹┖鎯呭喌锛岃嚦姝ゅ叾涓嶄负绌�
Driver dri = null ;
- String protocolName = TcpSessionCach.getTcpProtocolName(rtuAddr) ;
+ String protocolName = TcpSessionCache.getTcpProtocolName(rtuAddr) ;
if(protocolName == null){
//RTU鏈浘涓婄嚎
- int count = ProtocolCach.driverCount() ;
+ int count = ProtocolCache.driverCount() ;
if(count == 1){
//鍙湁涓�涓崗璁�
- dri = ProtocolCach.getFirstDriver() ;
+ dri = ProtocolCache.getFirstDriver() ;
}
}else{
- dri = ProtocolCach.getDriver(protocolName) ;
+ dri = ProtocolCache.getDriver(protocolName) ;
}
if(dri == null){
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒板崗璁�" + protocolName + "椹卞姩绫诲疄渚嬶紒");
--
Gitblit v1.8.0