From 97c30cdf60ebd8b702bb73c62c59b512e998677a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 10:54:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
index 313bc5c..25cb3db 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
@@ -41,6 +41,18 @@
public Long id;
/**
+ * 鍐滄埛瀹炰綋ID锛堝閿級
+ */
+ @Schema(description = "鍐滄埛瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ @Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String clientName;
+ /**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -97,60 +109,70 @@
* 姘翠綅锛堝崟浣�0.001绫筹級
*/
@Schema(description = "姘翠綅锛堝崟浣�0.001绫筹級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterLevel;
/**
* 姘村帇锛堝崟浣�0.01鍗冨笗锛�
*/
@Schema(description = "姘村帇锛堝崟浣�0.01鍗冨笗锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterPress;
/**
* 鐬椂娴侀噺锛堝崟浣�0.01m3/灏忔椂锛�
*/
@Schema(description = "鐬椂娴侀噺锛堝崟浣�0.01m3/灏忔椂锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterInstant;
/**
* 姘磋〃绱娴侀噺(鍗曚綅0.01m3)
*/
@Schema(description = "姘磋〃绱娴侀噺(鍗曚綅0.01m3)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterTotal;
/**
* 鐢佃〃绱鐢甸噺(鍗曚綅0.01搴�)
*/
@Schema(description = "鐢佃〃绱鐢甸噺(鍗曚綅0.01搴�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double eleTotal;
/**
* 鐢ㄦ埛鍓╀綑閲戦(鍗曚綅0.01鍏�)
*/
@Schema(description = "鐢ㄦ埛鍓╀綑閲戦(鍗曚綅0.01鍏�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double moneyRemain;
/**
* 鐢ㄦ埛鍓╀綑姘撮噺(鍗曚綅0.01m3)
*/
@Schema(description = "鐢ㄦ埛鍓╀綑姘撮噺(鍗曚綅0.01m3)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterRemain;
/**
* 鏈浣跨敤鐢甸噺(鍗曚綅0.01搴�)
*/
@Schema(description = "鏈浣跨敤鐢甸噺(鍗曚綅0.01搴�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double thisEle;
/**
* 鏈浣跨敤姘撮噺(鍗曚綅0.01m3)
*/
@Schema(description = "鏈浣跨敤姘撮噺(鍗曚綅0.01m3)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double thisWater;
/**
* 鏈浣跨敤閲戦(鍗曚綅0.01鍏�)
*/
@Schema(description = "鏈浣跨敤閲戦(鍗曚綅0.01鍏�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double thisMoney;
/**
@@ -163,66 +185,77 @@
* 褰撳墠姘撮噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)
*/
@Schema(description = "褰撳墠姘撮噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterPrice;
/**
* 褰撳墠鐢甸噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)
*/
@Schema(description = "褰撳墠鐢甸噺鍗曚环(鍗曚綅0.01鍏� 鏈�澶�99.99鍏�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double elePrice;
/**
* 浜ゆ祦A鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@Schema(description = "浜ゆ祦A鐩哥數鍘�(鍗曚綅0.1浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double aVolt;
/**
* 浜ゆ祦B鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@Schema(description = "浜ゆ祦B鐩哥數鍘�(鍗曚綅0.1浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double bVolt;
/**
* 浜ゆ祦C鐩哥數鍘�(鍗曚綅0.1浼忕壒)
*/
@Schema(description = "浜ゆ祦C鐩哥數鍘�(鍗曚綅0.1浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double cVolt;
/**
* 浜ゆ祦A鐩哥數娴�(鍗曚綅0.1瀹夊煿)
*/
@Schema(description = "浜ゆ祦A鐩哥數娴�(鍗曚綅0.1瀹夊煿)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double aCurrent;
/**
* 浜ゆ祦B鐩哥數娴佹暟鎹�(鍗曚綅0.1瀹夊煿)
*/
@Schema(description = "浜ゆ祦B鐩哥數娴佹暟鎹�(鍗曚綅0.1瀹夊煿)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double bCurrent;
/**
* 浜ゆ祦C鐩哥數娴�(鍗曚綅0.1瀹夊煿)
*/
@Schema(description = "浜ゆ祦C鐩哥數娴�(鍗曚綅0.1瀹夊煿)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double cCurrent;
/**
* 鍚庡鐢垫睜鐢靛帇(鍗曚綅0.01浼忕壒)
*/
@Schema(description = "鍚庡鐢垫睜鐢靛帇(鍗曚綅0.01浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double batteryVolt;
/**
* 姘磋〃杩滀紶鐢靛帇(鍗曚綅0.01浼忕壒)
*/
@Schema(description = "姘磋〃杩滀紶鐢靛帇(鍗曚綅0.01浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterMeterTransVolt;
/**
* 姘磋〃宸ヤ綔鐢靛帇(鍗曚綅0.01浼忕壒)
*/
@Schema(description = "姘磋〃宸ヤ綔鐢靛帇(鍗曚綅0.01浼忕壒)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterMeterWorkVolt;
public void valueFrom(DataV202404 dataV202404, DataCd80_5BVo cdData) throws Exception{
@@ -260,7 +293,7 @@
this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
//this.orderNo = cdData.orderNo ;
- //this.icCardAddr = cdData.icCardAddr ;
+ this.icCardAddr = cdData.cardAddr ;
this.icCardNo = cdData.cardNo ;
//this.waterLevel = cdData.waterLevel ;
//this.waterPress = cdData.waterPress ;
--
Gitblit v1.8.0