From 4728c1f514ba6f8af19cd03810f1367aedf1df0c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 五月 2025 13:48:57 +0800
Subject: [PATCH] 功能码9A、21、22、23、26、86、87、93、A2、A3远程命令接口定义与后端编码实现
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java | 177 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 111 insertions(+), 66 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
index 160ddc5..ab7ab1d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
@@ -1,12 +1,16 @@
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;
+import lombok.EqualsAndHashCode;
-//璁惧缁堢宸ヤ綔涓婃姤 + 璁惧缁堢宸ヤ綔涓婃姤
+//璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
@Data
-public class DataCd80_5BVo {
+@EqualsAndHashCode(callSuper=false)
+public class DataCd80_5BVo extends AlarmVo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿:
public Byte useWaterType ;//鐢ㄦ按鏂瑰紡锛�0x00:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按 0x01:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按 0x02:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按 0x03:娴嬭瘯鍗★紝0x04:鍏跺畠锛�
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
@@ -47,26 +51,11 @@
*/
public Integer csq ;//鎵嬫満淇″彿寮哄害 CSQ鍊硷紙锛�
- public Byte statePump ; //娉�/闃�鐘舵�� (1锛氬紑娉�/闃�锛�0锛氬叧娉�/闃�)
- public Byte alarmWaterRemain ; //鍓╀綑姘撮噺鎶ヨ (1锛氬皬浜庢姤璀︿笂闄愭姤璀� 0锛氭甯�)
- public Byte alarm0WaterRemain ; //鍓╀綑姘撮噺涓�0鍏虫车/闃� (1锛氬墿浣欐按閲忎负0鍏虫车 0锛氭甯�)
- public Byte alarmExceedYear ; //骞村害瓒呴噰鎶ヨ (1锛氬勾鐢ㄦ按閲忓ぇ浜庨檺鍒舵按閲忔姤璀� 0锛氭甯�)
- public Byte alarmWaterMeterFault ; //澶栭儴娴侀噺璁℃晠闅� (1锛氭祦閲忚鏁呴殰鎶ヨ 0锛氭甯�)
- public Byte alarmSteal ; //鍋锋按鎶ヨ (1锛氱粫寮�鎺у埗鍣ㄧ敤姘存姤璀� 0锛氭甯�)
- public Byte alarmWaterMeterBreak ; //娴侀噺璁℃崯鍧忔姤璀� (1锛氭甯搁�氳浣嗙灛鏃朵负0鎶ヨ 0锛氭甯�)
- public Byte alarmEleMeterFault ; //鐢佃〃鏁呴殰鎶ヨ (1锛氬拰鐢佃〃閫氳鏂垨鏁版嵁涓嶆甯� 0锛氭甯�)
- public Byte alarm0MoneyRemain ; //鍓╀綑閲戦涓�0鍏虫车/闃� (1锛氬墿浣欓噾棰濅负0鎶ヨ 0锛氭甯�)
- public Byte alarmInnerDoor ; //鎺у埗鍣ㄥ唴闂ㄦ姤璀� (1锛氬唴闂ㄦ墦寮�鎶ヨ 0锛氭甯�)
- public Byte alarmOuterDoor ; //鎺у埗鍣ㄥ闂ㄦ姤璀� (1锛氬闂ㄦ墦寮�鎶ヨ 0锛氭甯�)
- public Byte alarmEleMiss ; //浜ゆ祦缂洪」鎶ヨ (1锛氫笁鐩哥己椤规姤璀� 0锛氭甯�)
- public Byte alarmEleExceed ; //浜ゆ祦杩囨祦鎶ヨ (1锛氫氦娴佽繃娴佹姤璀� 0锛氭甯�)
- public Byte alarmEleLowVolt ; //涓夌浉鐢垫瑺鍘嬫姤璀� (1锛氭瑺鍘嬫姤璀� 0锛氭甯�)
- public Byte stateIcEnable ; //IC鍗′娇鑳� (1銆両C鏈夊埛鍗℃敮鎸� 0锛氫笉鏀寔)
-
-
-
public String comName ;//鍛戒护鍚嶇О
+ public DataCd80_5BVo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_5B) ;
+ }
public DataCd80_5BVo(String comName){
this.comName = comName ;
}
@@ -75,7 +64,7 @@
StringBuffer sb = new StringBuffer() ;
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) ;
@@ -161,51 +150,107 @@
sb.append(" 姘磋〃宸ヤ綔鐢靛帇 : ") ;
sb.append(waterMeterWorkVolt == null?"鏈煡":waterMeterWorkVolt) ;
sb.append("\n") ;
- sb.append(" 娉电姸鎬� : ") ;
- sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
- sb.append(" 鍓╀綑姘撮噺鎶ヨ : ") ;
- sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue()==1?"灏忎簬鎶ヨ涓婇檺":(alarmWaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
+ sb.append(" 淇″彿寮哄害 : ") ;
+ sb.append(csq == null?"鏈煡":csq) ;
sb.append("\n") ;
- sb.append(" 鍓╀綑姘撮噺涓�0鍏虫车/闃� : ") ;
- sb.append(alarm0WaterRemain == null?"鏈煡":(alarm0WaterRemain.byteValue()==1?"褰掗浂鍏虫车/闃�":(alarm0WaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 骞村害瓒呴噰 : ") ;
- sb.append(alarmExceedYear == null?"鏈煡":(alarmExceedYear.byteValue()==1?"鎶ヨ":(alarmExceedYear.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 澶栭儴娴侀噺璁℃晠闅� : ") ;
- sb.append(alarmWaterMeterFault == null?"鏈煡":(alarmWaterMeterFault.byteValue()==1?"鎶ヨ":(alarmWaterMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鍋锋按 : ") ;
- sb.append(alarmSteal == null?"鏈煡":(alarmSteal.byteValue()==1?"鎶ヨ":(alarmSteal.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 娴侀噺璁℃崯鍧� : ") ;
- sb.append(alarmWaterMeterBreak == null?"鏈煡":(alarmWaterMeterBreak.byteValue()==1?"鎶ヨ":(alarmWaterMeterBreak.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鐢佃〃鏁呴殰 : ") ;
- sb.append(alarmEleMeterFault == null?"鏈煡":(alarmEleMeterFault.byteValue()==1?"鎶ヨ":(alarmEleMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鍓╀綑閲戦涓�0鍏虫车/闃� : ") ;
- sb.append(alarm0MoneyRemain == null?"鏈煡":(alarm0MoneyRemain.byteValue()==1?"鎶ヨ":(alarm0MoneyRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鎺у埗鍣ㄥ唴闂� : ") ;
- sb.append(alarmInnerDoor == null?"鏈煡":(alarmInnerDoor.byteValue()==1?"鎶ヨ":(alarmInnerDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鎺у埗鍣ㄥ闂� : ") ;
- sb.append(alarmOuterDoor == null?"鏈煡":(alarmOuterDoor.byteValue()==1?"鎶ヨ":(alarmOuterDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 浜ゆ祦缂洪」 : ") ;
- sb.append(alarmEleMiss == null?"鏈煡":(alarmEleMiss.byteValue()==1?"鎶ヨ":(alarmEleMiss.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 浜ゆ祦杩囨祦 : ") ;
- sb.append(alarmEleExceed == null?"鏈煡":(alarmEleExceed.byteValue()==1?"鎶ヨ":(alarmEleExceed.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 涓夌浉鐢垫瑺鍘� : ") ;
- sb.append(alarmEleLowVolt == null?"鏈煡":(alarmEleLowVolt.byteValue()==1?"鎶ヨ":(alarmEleLowVolt.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" IC鍗′娇鑳� : ") ;
- sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue()==1?"鏀寔":(stateIcEnable.byteValue()==0?"涓嶆敮鎸�":"鏈煡"))) ;
- sb.append("\n") ;
- return sb.toString() ;
+ return sb + super.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("鐢ㄦ按鏂瑰紡 : ") ;
+ sb.append(useWaterType == null?"鏈煡":(useWaterType.byteValue()==0?"鍒峰崱寮�娉�/闃�":(useWaterType.byteValue()==1?"骞冲彴杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==2?"APP杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==3?"娴嬭瘯鍗″紑娉�/闃�":(useWaterType.byteValue()==4?"鍏朵粬":"鏈煡")))))) ;
+ sb.append("\n") ;
+ }
+ sb.append("璁㈠崟鍙� : ") ;
+ sb.append(orderNo == null?"鏈煡":orderNo) ;
+ 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(rtuDt == null?"鏈煡":rtuDt) ;
+ sb.append("\n") ;
+ sb.append("姘翠綅 : ") ;
+ sb.append(waterLevel == null?"鏈煡":waterLevel) ;
+ sb.append("\n") ;
+ sb.append("姘村帇 : ") ;
+ sb.append(waterPress == null?"鏈煡":waterPress) ;
+ sb.append("\n") ;
+ sb.append("鐬椂娴侀噺 : ") ;
+ sb.append(waterInstant == null?"鏈煡":waterInstant) ;
+ sb.append("\n") ;
+ sb.append("姘磋〃绱娴侀噺 : ") ;
+ sb.append(waterTotal == null?"鏈煡":waterTotal) ;
+ sb.append("\n") ;
+ sb.append("鐢佃〃绱鐢甸噺 : ") ;
+ sb.append(eleTotal == null?"鏈煡":eleTotal) ;
+ sb.append("\n") ;
+ sb.append("鐢ㄦ埛鍓╀綑閲戦 : ") ;
+ sb.append(moneyRemain == null?"鏈煡":moneyRemain) ;
+ sb.append("\n") ;
+ sb.append("鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
+ sb.append(waterRemain == null?"鏈煡":waterRemain) ;
+ sb.append("\n") ;
+ sb.append("鏈浣跨敤鐢甸噺 : ") ;
+ sb.append(thisEle == null?"鏈煡":thisEle) ;
+ sb.append("\n") ;
+ sb.append("鏈浣跨敤姘撮噺 : ") ;
+ sb.append(thisWater == null?"鏈煡":thisWater) ;
+ sb.append("\n") ;
+ sb.append("鏈浣跨敤閲戦 : ") ;
+ sb.append(thisMoney == null?"鏈煡":thisMoney) ;
+ sb.append("\n") ;
+ sb.append("鏈浣跨敤鏃堕暱 : ") ;
+ sb.append(thisDuration == null?"鏈煡":thisDuration) ;
+ sb.append("\n") ;
+ sb.append("褰撳墠姘撮噺鍗曚环 : ") ;
+ sb.append(waterPrice == null?"鏈煡":waterPrice) ;
+ sb.append("\n") ;
+ sb.append("褰撳墠鐢甸噺鍗曚环 : ") ;
+ sb.append(elePrice == null?"鏈煡":elePrice) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦A鐩哥數鍘� : ") ;
+ sb.append(aVolt == null?"鏈煡":aVolt) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦B鐩哥數鍘� : ") ;
+ sb.append(bVolt == null?"鏈煡":bVolt) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦C鐩哥數鍘� : ") ;
+ sb.append(cVolt == null?"鏈煡":cVolt) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦A鐩哥數娴� : ") ;
+ sb.append(aCurrent == null?"鏈煡":aCurrent) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦B鐩哥數娴� : ") ;
+ sb.append(bCurrent == null?"鏈煡":bCurrent) ;
+ sb.append("\n") ;
+ sb.append("浜ゆ祦C鐩哥數娴� : ") ;
+ sb.append(cCurrent == null?"鏈煡":cCurrent) ;
+ sb.append("\n") ;
+ sb.append("鍚庡鐢垫睜鐢靛帇 : ") ;
+ sb.append(batteryVolt == null?"鏈煡":batteryVolt) ;
+ sb.append("\n") ;
+ sb.append("姘磋〃杩滀紶鐢靛帇 : ") ;
+ sb.append(waterMeterTransVolt == null?"鏈煡":waterMeterTransVolt) ;
+ sb.append("\n") ;
+ sb.append("姘磋〃宸ヤ綔鐢靛帇 : ") ;
+ sb.append(waterMeterWorkVolt == null?"鏈煡":waterMeterWorkVolt) ;
+ sb.append("\n") ;
+ sb.append("淇″彿寮哄害 : ") ;
+ sb.append(csq == null?"鏈煡":csq) ;
+ sb.append("\n") ;
+ return sb + super.toStr() ;
+ }
}
--
Gitblit v1.8.0