From 186aac796d81fd1799c9503558c1081c5102ab74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 二月 2025 17:18:11 +0800
Subject: [PATCH] 根据RTU协议修改内容，将开关阀类型加入上报数据中；
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
index 8f04053..1a2827a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
@@ -22,7 +22,7 @@
private static Double totalWaterAmount = 1234.56 ;//绱娴侀噺
private static Double remainMoney = 65.4321 ;//鍓╀綑閲戦
- private static Double thisWaterAmount = 100.00 ;//鏈浣跨敤鐢甸噺
+ private static Double thisWaterAmount = 100.00 ;//鏈浣跨敤姘撮噺
private static Double thisMoney = 10.00 ;//鏈浣跨敤閲戦
public static void upCd84Data(String rtuAddr){
@@ -84,7 +84,7 @@
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[8] ;//鏈璁㈠崟鍙� 8瀛楄妭 BCD鐮�
- ByteUtil.string2BCD_LE( bs, orderNo,0);
+ ByteUtil.string2BCD_BE( bs, orderNo,0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[6] ;//寮�娉�/闃�鏃堕棿 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾)
@@ -133,7 +133,7 @@
openValveDt = DateTime.yyMMddhhmmss() ;
}
- totalWaterAmount -= thisWaterAmount ;
+ totalWaterAmount += thisWaterAmount ;
remainMoney -= thisMoney ;
byte[] bytes = creatHead(rtuAddr, "85", (byte)0x81);
@@ -156,7 +156,7 @@
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[8] ;//鏈璁㈠崟鍙� 8瀛楄妭 BCD鐮�
- ByteUtil.string2BCD_LE( bs, orderNo,0);
+ ByteUtil.string2BCD_BE( bs, orderNo,0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[6] ;//寮�濮嬫椂闂� 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾)
@@ -164,7 +164,7 @@
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[6] ;//缁撴潫鏃堕棿 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾)
- ByteUtil.string2BCD_LE( bs, DateTime.yyyyMMddHHmmss(),0);
+ ByteUtil.string2BCD_LE( bs, DateTime.yyMMddhhmmss(),0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[5] ;//姘磋〃绱姘撮噺 5瀛楄妭BCD鐮侊紝鍗曚綅0.01绔嬫柟绫�
@@ -188,7 +188,7 @@
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[4] ;//鏈浣跨敤姘撮噺 4瀛楄妭BCD鐮� 鍗曚綅0.01绔嬫柟绫�
- ByteUtil.int2BCD_LE(Double.valueOf(thisWaterAmount * 10000).intValue(), bs, 0);
+ ByteUtil.int2BCD_LE(Double.valueOf(thisWaterAmount * 100).intValue(), bs, 0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[4] ;//鏈浣跨敤閲戦 4瀛楄妭BCD鐮� 鍗曚綅0.0001鍏�
--
Gitblit v1.8.0