From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 17:29:42 +0800
Subject: [PATCH] 1、根据江海调整，功能码92、A2的应答中的日期时间去除； 2、表阀一体机的开关阀上行数据（84、85）处理逻辑进行修改。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java
index 4803d67..20a85de 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
@@ -7,7 +8,7 @@
@Data
public class DataCd55Vo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�02锛�0x02锛�:琛ㄩ榾涓�浣撴満锛�57(0x57):浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿
public String icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
public String icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�16浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
@@ -18,6 +19,9 @@
public String dt ;//鍏呭�兼椂闂达紙yyyy-mm-dd HH:mm:ss锛�
public String comName ;//鍛戒护鍚嶇О
+ public DataCd55Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_55) ;
+ }
public DataCd55Vo(String comName){
this.comName = comName ;
@@ -56,4 +60,38 @@
return sb.toString() ;
}
+ public String toStr(boolean showBase){
+ StringBuffer sb = new StringBuffer() ;
+ if(showBase){
+ sb.append(comName + " : \n") ;
+ sb.append("鎺у埗鍣ㄧ被鍨� : ") ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
+ sb.append("\n") ;
+ sb.append("椤圭洰缂栧彿 : ") ;
+ sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ }
+ sb.append("IC鍗″湴鍧� : ") ;
+ sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
+ sb.append("\n") ;
+ sb.append("鐢ㄦ埛鍗″簭鍒楀彿 : ") ;
+ sb.append(icCardNo == null?"鏈煡":icCardNo) ;
+ sb.append("\n") ;
+ sb.append("鍏呭�奸噾棰� : ") ;
+ sb.append(chargeMoney == null?"鏈煡":chargeMoney) ;
+ sb.append("\n") ;
+ sb.append("鍏呭�兼按閲� : ") ;
+ sb.append(chargeWater == null?"鏈煡":chargeWater) ;
+ sb.append("\n") ;
+ sb.append("娴佹按鍙� : ") ;
+ sb.append(flowNo == null?"鏈煡":flowNo) ;
+ sb.append("\n") ;
+ sb.append("鍏呭�肩粨鏋� : ") ;
+ sb.append(success == null?"鏈煡":(success.booleanValue()?"鎴愬姛":"澶辫触")) ;
+ sb.append("\n") ;
+ sb.append("鍏呭�兼椂闂� : ") ;
+ sb.append(dt == null?"鏈煡":dt) ;
+ sb.append("\n") ;
+ return sb.toString() ;
+ }
}
--
Gitblit v1.8.0