From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java index 8cebaa7..4b503e9 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java @@ -1,13 +1,16 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; +import lombok.EqualsAndHashCode; //寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤 @Data +@EqualsAndHashCode(callSuper=false) public class DataCdC2Vo extends AlarmVo { public String controllerType ;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣� public Integer projectNo ;//椤圭洰缂栧彿: + public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級 public Byte opType1 ;//鎿嶄綔鏂瑰紡锛�0:鍒峰崱寮�姘存车/闃�闂紱1:杩滅▼寮�姘存车/闃�闂紱2:APP寮�姘存车/闃�闂� public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴 public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛� @@ -28,6 +31,9 @@ sb.append(" 椤圭洰缂栧彿 : ") ; sb.append(projectNo == null?"鏈煡":projectNo) ; sb.append("\n") ; + sb.append(" 璁㈠崟鍙� : ") ; + sb.append(orderNo == null?"鏈煡":orderNo) ; + sb.append("\n") ; sb.append(" 鎿嶄綔鏂瑰紡 : ") ; sb.append(opType1 == null?"鏈煡":(opType1.byteValue()==0?"鍒峰崱":(opType1.byteValue()==1?"杩滅▼":(opType1.byteValue()==2?"App":"鏈煡")))) ; sb.append("\n") ; -- Gitblit v1.8.0