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/DataCd85Vo.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
new file mode 100644
index 0000000..5037c15
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
@@ -0,0 +1,87 @@
+package com.dy.common.mw.protocol.p206V202404.upVos;
+
+import lombok.Data;
+
+//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� + 鍒峰崱鍏虫车/闃�涓婃姤
+@Data
+public class DataCd85Vo extends AlarmVo {
+
+ public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
+ public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public Byte opType ;//鍏虫车/闃�鏂瑰紡: 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓嶈冻鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢点��
+ public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+ public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ public String startDt ;//寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
+ public String endDt ;//缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
+ public Double waterTotalAmount ;//姘磋〃绱娴侀噺
+ public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺
+ public Double moneyRemain ;//鐢ㄦ埛鍓╀綑閲戦锛屽崟浣�0.01鍏�
+ public Double waterRemain ;//鐢ㄦ埛鍓╀綑姘撮噺锛屼繚鐣� 榛樿 00 00 00 00 00
+ public Double thisEle ;//鏈浣跨敤鐢甸噺, 鍗曚綅0.01搴�
+ public Double thisWater ;//鏈浣跨敤姘撮噺, 鍗曚綅0.01绔嬫柟绫�
+ public Double thisMoney ;//鏈浣跨敤閲戦, 鍗曚綅0.01鍏�
+ public Integer thisDuration;//鏈浣跨敤鏃堕棿闀�, 鍗曚綅锛氬垎閽�
+
+ public String comName ;//鍛戒护鍚嶇О
+
+ public DataCd85Vo(String comName){
+ this.comName = comName ;
+ }
+
+
+ public String toString(){
+ StringBuffer sb = new StringBuffer() ;
+ sb.append(" " + comName + " : \n") ;
+ sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ;
+ sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
+ sb.append("\n") ;
+ sb.append(" 椤圭洰缂栧彿 : ") ;
+ sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ sb.append(" 鍏虫车/闃�绫诲瀷 : ") ;
+ sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x00 ? "鍒峰崱":(opType.byteValue() == 0x01 ? "骞冲彴":(opType.byteValue() == 0x02 ? "APP":(opType.byteValue() == 0x03 ? "闈炴硶鍗�":(opType.byteValue() == 0x04 ? "姘磋〃寮傚父":(opType.byteValue() == 0x05 ? "鐢佃〃寮傚父":(opType.byteValue() == 0x06 ? "鍓╀綑姘撮噺涓嶈冻":(opType.byteValue() == 0x07 ? "鍓╀綑閲戦涓嶈冻":(opType.byteValue() == 0x08 ? "鏃犳祦閲�":(opType.byteValue() == 0x09 ? "鎺夌數鍐嶄笂鐢�":"鏈煡"))))))))))) ;
+ sb.append("\n") ;
+ sb.append(" IC鍗″湴鍧� : ") ;
+ sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
+ sb.append("\n") ;
+ sb.append(" IC鍗＄紪鍙� : ") ;
+ sb.append(icCardNo == null?"鏈煡":icCardNo) ;
+ sb.append("\n") ;
+ sb.append(" 璁㈠崟鍙� : ") ;
+ sb.append(orderNo == null?"鏈煡":orderNo) ;
+ sb.append("\n") ;
+ sb.append(" 寮�濮嬫椂闂� : ") ;
+ sb.append(startDt == null?"鏈煡":startDt) ;
+ sb.append("\n") ;
+ sb.append(" 缁撴潫鏃堕棿 : ") ;
+ sb.append(endDt == null?"鏈煡":endDt) ;
+ sb.append("\n") ;
+ sb.append(" 姘磋〃绱娴侀噺 : ") ;
+ sb.append(waterTotalAmount == null?"鏈煡":waterTotalAmount) ;
+ sb.append("\n") ;
+ sb.append(" 鐢佃〃绱鐢甸噺 : ") ;
+ sb.append(eleTotalAmount == null?"鏈煡":eleTotalAmount) ;
+ 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") ;
+ return sb.toString() + super.toString() ;
+ }
+
+}
--
Gitblit v1.8.0