From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 23 五月 2024 08:50:58 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
index 3686ca7..e9280fe 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
@@ -84,7 +84,7 @@
      */
     protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
         DataV202404 dV1 = (DataV202404)data.getSubData() ;
-        DataCd81Vo cdData = new DataCd81Vo() ;
+        DataCd81Vo cdData = new DataCd81Vo(CodeV202404.getCodeName(dataCode)) ;
         dV1.subData = cdData ;
 
         int index = ProtocolConstantV206V202404.dataIndex ;
@@ -94,6 +94,9 @@
         cdData.projectNo = (int)bs[index];
 
         index++ ;
-        GlParse.parseAlarmAndState(bs, index, cdData) ;
+        cdData.rtuDt = GlParse.parseRtuDt(bs, index) ;
+
+        index += 6 ;
+        GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
     }
 }

--
Gitblit v1.8.0