From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 24 二月 2025 15:33:53 +0800 Subject: [PATCH] 有关表阀一体机(王江海制定)通信协议: 1、根据新版本协议,解析部分更新; 2、根据测试一体阀协议数据处理需求与逻辑,进行表阀一体机数据处理。 --- 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..a95c192 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,13 +6,13 @@ public class OnLineHandle { /** - * 瑙f瀽涓婄嚎鏁版嵁锛屽緱鍒癐MEI鍙� + * 瑙f瀽涓婄嚎鏁版嵁锛屽緱鍒癛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() ; + HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCache.getOnLineMap() ; Collection<AnnotationOnLineVo> set = onLineMap.values() ; if(set.size() == 0){ throw new Exception("澶勭悊涓婄嚎鏃讹紝寰楀埌鐨勫崗璁泦鍚堜负绌恒��") ; @@ -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){ -- Gitblit v1.8.0