From 2ef075d66cf5bc95562f2e584ed6283776062f24 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 24 十一月 2023 10:25:38 +0800
Subject: [PATCH] 1、优化通信中间件代码； 2、实现功能码71协议（查询阀门状态）
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
index b2f7d94..61ac4bd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
@@ -6,11 +6,11 @@
public class OnLineHandle {
/**
- * 瑙ｆ瀽涓婄嚎鏁版嵁锛屽緱鍒癐MEI鍙�
+ * 瑙ｆ瀽涓婄嚎鏁版嵁锛屽緱鍒癛tuAddr
* @param bs 瀛楄妭鏁扮粍
* @return OnLine.OnLineResult
*/
- public OnLine.OnLineResult parse(String aepImei, byte[] bs)throws Exception{
+ public OnLine.OnLineResult parse(byte[] bs)throws Exception{
OnLine.OnLineResult rs = null ;
HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCach.getOnLineMap() ;
Collection<AnnotationOnLineVo> set = onLineMap.values() ;
@@ -27,7 +27,7 @@
//璇存槑涓婄嚎澶勭悊闆嗗悎宸茬粡閬嶅巻瀹屼簡銆�
break ;
}
- rs = onLine.parse(aepImei, bs) ;
+ rs = onLine.parse(bs) ;
OnLinePool.freeInstance(((AnnotationOnLineVo)objs[1]).clazz, onLine);
if(rs != null){
if(rs.result == OnLine.OnLineAction_success){
@@ -47,7 +47,7 @@
}
}
if(rs == null){
- throw new Exception("澶勭悊涓婄嚎鏃跺嚭閿欙紝鏈兘鎴愬姛鍒嗘瀽鍑篒MEI鍙凤紒") ;
+ throw new Exception("澶勭悊涓婄嚎鏃跺嚭閿欙紝鏈兘鎴愬姛鍒嗘瀽鍑篟tu鍦板潃锛�") ;
}
return rs ;
}
--
Gitblit v1.8.0