From cdce015a7143b5e9d0fb003b80b9aa307906c14b Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 02 十二月 2024 11:48:25 +0800 Subject: [PATCH] 修改升级协议中的bug,帧长度由大端模式改为小端模式 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 ddb99e3..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,17 +1,20 @@ 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澶辫触锛� - public String rutDt ;//璁惧鏃堕挓 + public String rtuDt;//璁惧鏃堕挓 public String comName ;//鍛戒护鍚嶇О @@ -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") ; @@ -35,7 +41,7 @@ sb.append(opType2 == null?"鏈煡":(opType2.byteValue()==0?"寮�鍚按娉�/闃�闂�":(opType2.byteValue()==1?"鍏抽棴姘存车/闃�闂�":"鏈煡"))) ; sb.append("\n") ; sb.append(" 璁惧鏃堕挓 : ") ; - sb.append(rutDt == null?"鏈煡":rutDt) ; + sb.append(rtuDt == null?"鏈煡": rtuDt) ; sb.append("\n") ; sb.append(" 鎵ц缁撴灉 : ") ; sb.append(success == null?"鏈煡":(success?"鎴愬姛":"澶辫触")) ; -- Gitblit v1.8.0