From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
index f196071..917fedf 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
@@ -23,18 +23,7 @@
Data d = (Data)data ;
if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V202404.protocolName)){
//璇嗗埆鍑烘槸P206V202404鍗忚鏁版嵁
- //鏃犲懡浠D
- boolean toNext = true ;
- if(d.getSubData() != null) {
- DataV202404 dataV202404 = (DataV202404)d.getSubData() ;
- if(dataV202404 != null && dataV202404.subData != null && dataV202404.subData instanceof DataCd02Vo){
- //杩囨护鎺夊績璺虫暟鎹�
- toNext = false ;
- }
- }
- if(toNext){
- this.toNextTasks(data);
- }
+ this.toNextTasks(data);
}else{
//涓嶆槸鏈崗璁殑鏁版嵁
}
--
Gitblit v1.8.0