From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java
index 6c725e0..b495953 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java
@@ -41,6 +41,11 @@
private String clientName;
/**
+ * 鍐滄埛鍦板潃
+ */
+ private String clientAddr;
+
+ /**
* IC鍗＄紪鍙�
*/
private String icNum;
@@ -64,51 +69,61 @@
/**
* 姘翠綅锛堝崟浣�0.001绫筹級
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.000" )
private Double waterLevel;
/**
* 姘村帇锛堝崟浣�0.01鍗冨笗锛�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterPress;
/**
* 鐬椂娴侀噺锛堝崟浣�0.01m3/灏忔椂锛�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterInstant;
/**
* 姘磋〃绱娴侀噺(鍗曚綅0.01m3)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterTotal;
/**
* 鐢佃〃绱鐢甸噺(鍗曚綅0.01搴�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double eleTotal;
/**
* 鐢ㄦ埛鍓╀綑閲戦(鍗曚綅0.01鍏�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double moneyRemain;
/**
* 鐢ㄦ埛鍓╀綑姘撮噺(鍗曚綅0.01m3)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterRemain;
/**
* 鏈浣跨敤鐢甸噺(鍗曚綅0.01搴�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double thisEle;
/**
* 鏈浣跨敤姘撮噺(鍗曚綅0.01m3)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double thisWater;
/**
* 鏈浣跨敤閲戦(鍗曚綅0.01鍏�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double thisMoney;
/**
@@ -119,61 +134,73 @@
/**
* 褰撳墠姘撮噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterPrice;
/**
* 褰撳墠鐢甸噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double elePrice;
/**
* 浜ゆ祦A鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@JsonProperty("aVolt")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double aVolt;
/**
* 浜ゆ祦B鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@JsonProperty("bVolt")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double bVolt;
/**
* 浜ゆ祦C鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@JsonProperty("cVolt")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double cVolt;
/**
* 浜ゆ祦A鐩哥數娴�(鍗曚綅0.1瀹夊煿)
*/
@JsonProperty("aCurrent")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double aCurrent;
/**
* 浜ゆ祦B鐩哥數娴佹暟鎹�(鍗曚綅0.1瀹夊煿)
*/
@JsonProperty("bCurrent")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double bCurrent;
/**
* 浜ゆ祦C鐩哥數娴�(鍗曚綅0.1瀹夊煿)
*/
@JsonProperty("cCurrent")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double cCurrent;
/**
* 鍚庡鐢垫睜鐢靛帇(鍗曚綅0.01浼忕壒)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double batteryVolt;
/**
* 姘磋〃杩滀紶鐢靛帇(鍗曚綅0.01浼忕壒)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterMeterTransVolt;
/**
* 姘磋〃宸ヤ綔鐢靛帇(鍗曚綅0.01浼忕壒)
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterMeterWorkVolt;
+
}
--
Gitblit v1.8.0