From 44a78bc47ab66d6492bc0579f58f24dc1921b5d5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 03 四月 2025 15:44:30 +0800
Subject: [PATCH] 1、webSocket相关代码进行了注解优化; 2、通信中间件把阀控器上报的阀门状态进行消息推送,前端、小程序可能用到(webSocket推送)。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index d03d85e..960178c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -1,5 +1,6 @@
 package com.dy.common.mw.protocol.p206V202404.parse.global;
 
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
 import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
 import com.dy.common.mw.protocol.p206V202404.upVos.*;
 import com.dy.common.util.ByteUtil;
@@ -242,6 +243,8 @@
 
         index ++ ;
         cdData.clType = bs[index];
+        //杩涜鍏煎杞崲
+        cdData.clType = CommonV202404.closeType2P206V1(cdData.clType) ;
 
         index++ ;
         cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -299,10 +302,10 @@
         cdData.projectNo = (int)bs[index];
 
         index ++ ;
-        cdData.opResult = bs[index];
+        cdData.clResult = bs[index];
 
         index ++ ;
-        cdData.opType = bs[index];
+        cdData.clType = bs[index];
 
         index++ ;
         cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -316,7 +319,7 @@
         index += 8 ;
         cdData.startDt  = GlParse.parseRtuDt(bs, index) ;
 
-        if(cdData.opResult == (byte)0x81){
+        if(cdData.clResult == (byte)0x81){
             //澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
             return ;
         }

--
Gitblit v1.8.0