From f3d3eacf5af65ebfcfcc3b82e7488401ac545453 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:31:18 +0800
Subject: [PATCH] 完善王江海制定协议的实现代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 3 +--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java | 5 +++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
index fc8e872..973d5cf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
@@ -46,10 +46,11 @@
byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
if(para.param != null){
DataCd80_5BVo cdData = (DataCd80_5BVo)para.param ;
- byte[] bs = new byte[2] ;
+ byte[] bs = new byte[3] ;
bs[0] = (byte)(Integer.parseInt(cdData.getControllerType(), 16));
bs[1] = cdData.projectNo.byteValue() ;
- GlCreate.createTp(bs, 2) ;
+ bs[2] = 0x01 ;//01:鎴愬姛 81:澶辫触
+ //GlCreate.createTp(bs, 2) ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
throw new Exception("涓嬭鍛戒护鍙傛暟鎹负null") ;
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 25b6deb..326c99c 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
@@ -94,7 +94,7 @@
cdData.projectNo = (int)bs[index];
index++ ;
- GlParse.parseRtuDt(bs, index) ;
+ cdData.rtuDt = GlParse.parseRtuDt(bs, index) ;
index += 6 ;
GlParse.parseAlarmAndState(bs, index, cdData) ;
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 7d57f49..6f32f1c 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
@@ -58,7 +58,7 @@
* @return
*/
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
- byte b = bs[index] ;
+ byte b = bs[index + 1] ;
vo.statePump = (byte)(b & 0x1) ;
vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
@@ -68,7 +68,6 @@
vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
- index++ ;
b = bs[index] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
index 2c5b7fb..9ce7c9f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
@@ -67,7 +67,7 @@
sb.append(" 涓夌浉鐢垫瑺鍘� : ") ;
sb.append(alarmEleLowVolt == null?"鏈煡":(alarmEleLowVolt.byteValue() == 0 ? "姝ｅ父":(alarmEleLowVolt.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
sb.append("\n") ;
- sb.append(" IC鍗′娇鑳� : ") ;
+ sb.append(" 鏀寔IC鍗� : ") ;
sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue() == 0 ? "鏀寔":(stateIcEnable.byteValue() == 1 ? "涓嶆敮鎸�":"鏈煡"))) ;
sb.append("\n") ;
--
Gitblit v1.8.0