From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 22:07:02 +0800
Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性，都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )； 2、工作报中数据查询SQL中增加clientAddr农户地址字段。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 4419eac..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
@@ -109,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;
/**
@@ -175,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{
--
Gitblit v1.8.0