From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java | 55 ++++++++-----------------------------------------------
1 files changed, 8 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java
index c444dd9..5c1047d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java
@@ -10,9 +10,15 @@
public Integer projectNo ;//椤圭洰缂栧彿:
public String rtuDt ;//璁惧涓婃姤鐨勬棩鏈熸椂闂�(yyyy-mm-dd HH:MM:SS)
+ public String comName ;//鍛戒护鍚嶇О
+
+ public DataCd81Vo(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("\n") ;
@@ -22,52 +28,7 @@
sb.append(" 璁惧鏃堕挓 : ") ;
sb.append(rtuDt == null?"鏈煡":rtuDt) ;
sb.append("\n") ;
- sb.append(" 娉电姸鎬� : ") ;
- sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
- sb.append("\n") ;
- sb.append(" 鍓╀綑姘撮噺鎶ヨ : ") ;
- sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue()==1?"灏忎簬鎶ヨ涓婇檺":(alarmWaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
- 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.toString() + super.toString() ;
}
}
--
Gitblit v1.8.0