From 2daa780ed9c74cb689f7c1e6a13f8aadebd57208 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 五月 2025 16:59:09 +0800
Subject: [PATCH] 表阀一体协议，修改域名及端口解析，适应空值情况。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/WebDownComTask.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/WebDownComTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/WebDownComTask.java
index 73777fd..9d49d97 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/WebDownComTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/WebDownComTask.java
@@ -44,29 +44,27 @@
Object[] objs = TcpSessionCache.getTcpProtocolNameVersion(rtuAddr) ;
if(objs == null || objs.length == 0 || objs[0] == null){
//RTU鏈浘涓婄嚎
- /* 2024-11-02 澧炲姞浜嗗崗璁増鏈彿锛屼笖涓�涓崗璁彲浠ユ湁澶氫釜鐗堟湰鍙凤紝鎵�浠ヤ笅闈㈠緱鍒板敮涓�鍗忚椹卞姩瀹炵幇鏂瑰紡涓嶅彲鐢ㄤ簡锛屽洜涓虹‘瀹氫笉浜嗙増鏈彿
int count = ProtocolCache.driverCount() ;
if(count == 1){
//鍙湁涓�涓崗璁�
dri = ProtocolCache.getFirstDriver() ;
}
- */
}else{
String protocolName = (String)objs[0];
com.protocolVersion = (Short)objs[1];
- dri = ProtocolCache.getDriver(protocolName) ;
- if(dri == null){
- log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒板崗璁�" + protocolName + "椹卞姩绫诲疄渚嬶紒");
- }else{
- MidResult[] actions = dri.createCommand(ServerProperties.isLowPower, com) ;
- log.info("涓嬪彂杩滅▼鍛戒护" + com.getCode() + "鐢卞崗璁┍鍔ㄦ瀯閫犲畬鎴�");
- if(actions != null){
- for(MidResult act : actions){
- act.action();
- }
+ dri = ProtocolCache.getDriver(protocolName, com.protocolVersion) ;
+ }
+ if(dri == null){
+ log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癛TU(" + rtuAddr + ")椹卞姩绫诲疄渚嬶紒");
+ }else{
+ MidResult[] actions = dri.createCommand(ServerProperties.isLowPower, com) ;
+ log.info("涓嬪彂杩滅▼鍛戒护" + com.getCode() + "鐢卞崗璁┍鍔ㄦ瀯閫犲畬鎴�");
+ if(actions != null){
+ for(MidResult act : actions){
+ act.action();
}
}
- }
+ }
}
}
--
Gitblit v1.8.0