From 0431c6943c1a61df0e9e4feb61f3333dd3622d21 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 28 五月 2025 15:16:48 +0800
Subject: [PATCH] 1、表阀一体：查询日记录数据中金额数据小数位是4位，相应除以10000.00; 2、表阀一体：所以命令结果VO实现指定接口，以数据库中保存命令日志。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd55Vo.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 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 a2c4b9a..160d4b4 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,13 +1,16 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.UpComResVo;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
//鏌ヨ璁惧缁堢鍏呭�艰褰�
@Data
-public class DataCd55Vo {
+public class DataCd55Vo implements UpComResVo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
- public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
+ public Integer projectNo ;//椤圭洰缂栧彿
public String icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
public String icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�16浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
public Double chargeMoney ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
@@ -16,12 +19,20 @@
public Boolean success ;//鍛戒护缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
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 ;
+ }
public String toString(){
StringBuffer sb = new StringBuffer() ;
- sb.append(" 鏌ヨ璁惧缁堢鍏呭�艰褰� : \n") ;
+ sb.append(" " + comName + " : \n") ;
sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ;
- sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
sb.append("\n") ;
sb.append(" 椤圭洰缂栧彿 : ") ;
sb.append(projectNo == null?"鏈煡":projectNo) ;
@@ -50,4 +61,52 @@
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() ;
+ }
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨ璁惧缁堢鍏呭�艰褰曞洖澶�:\n");
+ sb.append(toStr(false)) ;
+
+ return sb.toString() ;
+ }
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
--
Gitblit v1.8.0