From 8276c60682d1c69e632ac010988c5ada173a178e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 06 二月 2025 16:28:03 +0800
Subject: [PATCH] 1、大屏展示模块：基本信息统计、当前信息统计、监测信息统计（部分）； 2、优化代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 269 insertions(+), 16 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 2dff0cd..f2515b7 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
@@ -5,7 +5,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mw.protocol.p206V1.DataV1;
+import com.dy.common.mw.protocol.p206V2.DataV2;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80_5BVo;
import com.dy.common.po.BaseEntity;
+import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -13,20 +18,19 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/28 8:52
- * @LastEditTime 2024/2/28 8:52
- * @Description 缁堢宸ヤ綔鎶ュ巻鍙叉暟鎹�
+ * @Author: liurunyu
+ * @Date: 2024/6/14 10:58
+ * @Description 缁堢闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹�
*/
+
@TableName(value="rm_work_report_history", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "缁堢宸ヤ綔鎶ュ巻鍙叉暟鎹�")
-public class RmWorkReportHistory implements BaseEntity {
-
+@Schema(name = "缁堢闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹�")
+public class RmWorkReportHistory implements BaseEntity {
public static final long serialVersionUID = 202402280859001L;
/**
* 涓婚敭
@@ -36,6 +40,18 @@
@TableId(type = IdType.INPUT)
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锛堝閿級
*/
@@ -71,28 +87,265 @@
public Date rtuDt;
/**
+ * 璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ @Schema(hidden=true)
+ @JSONField(serialize = false)
+ public String orderNo;
+
+ /**
+ * IC鍗″湴鍧�(杩滅▼寮�娉�/闃�鏃跺叏涓�0)
+ */
+ @Schema(description = "IC鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String icCardAddr;
+
+ /**
* IC鍗＄紪鍙�
*/
@Schema(description = "IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String icCardNo;
/**
- * 绱娴侀噺
+ * 姘翠綅锛堝崟浣�0.001绫筹級
*/
- @Schema(description = "绱娴侀噺锛坢3锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double totalAmount;
+ @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 = "鐬椂娴侀噺锛坢3/h锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double instantAmount;
+ @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 = "鍓╀綑钂傞噾棰濓紙鍏冿級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double remainMoney;
+ @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;
+
+ /**
+ * 鏈浣跨敤鏃堕暱(鍗曚綅:鍒嗛挓 鏈�澶�9999鍒嗛挓)
+ */
+ @Schema(description = "鏈浣跨敤鏃堕暱(鍗曚綅:鍒嗛挓 鏈�澶�9999鍒嗛挓)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer thisDuration;
+
+ /**
+ * 褰撳墠姘撮噺鍗曚环(鍗曚綅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{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ this.orderNo = cdData.orderNo ;
+ this.icCardAddr = cdData.icCardAddr ;
+ this.icCardNo = cdData.icCardNo ;
+ this.waterLevel = cdData.waterLevel ;
+ this.waterPress = cdData.waterPress ;
+ this.waterInstant = cdData.waterInstant ;
+ this.waterTotal = cdData.waterTotal ;
+ this.eleTotal = cdData.eleTotal ;
+ this.moneyRemain = cdData.moneyRemain ;
+ this.waterRemain = cdData.waterRemain ;
+ this.thisEle = cdData.thisEle ;
+ this.thisWater = cdData.thisWater ;
+ this.thisMoney = cdData.thisMoney ;
+ this.thisDuration = cdData.thisDuration ;
+ this.waterPrice = cdData.waterPrice ;
+ this.elePrice = cdData.elePrice ;
+ this.aVolt = cdData.aVolt ;
+ this.bVolt = cdData.bVolt ;
+ this.cVolt = cdData.cVolt ;
+ this.aCurrent = cdData.aCurrent ;
+ this.bCurrent = cdData.bCurrent ;
+ this.cCurrent = cdData.cCurrent ;
+ this.batteryVolt = cdData.batteryVolt ;
+ this.waterMeterTransVolt = cdData.waterMeterTransVolt ;
+ this.waterMeterWorkVolt = cdData.waterMeterWorkVolt ;
+ }
+ public void valueFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd84Vo cdData) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ //this.orderNo = cdData.orderNo ;
+ this.icCardAddr = cdData.cardAddr ;
+ this.icCardNo = cdData.cardNo ;
+ //this.waterLevel = cdData.waterLevel ;
+ //this.waterPress = cdData.waterPress ;
+ this.waterInstant = cdData.instantAmount ;
+ this.waterTotal = cdData.totalAmount ;
+ //this.eleTotal = cdData.eleTotal ;
+ this.moneyRemain = cdData.remainMoney ;
+ //this.waterRemain = cdData.waterRemain ;
+ //this.thisEle = cdData.thisEle ;
+ //this.thisWater = cdData.thisWater ;
+ //this.thisMoney = cdData.thisMoney ;
+ //this.thisDuration = cdData.thisDuration ;
+ //this.waterPrice = cdData.waterPrice ;
+ //this.elePrice = cdData.elePrice ;
+ //this.aVolt = cdData.aVolt ;
+ //this.bVolt = cdData.bVolt ;
+ //this.cVolt = cdData.cVolt ;
+ //this.aCurrent = cdData.aCurrent ;
+ //this.bCurrent = cdData.bCurrent ;
+ //this.cCurrent = cdData.cCurrent ;
+ //this.batteryVolt = cdData.batteryVolt ;
+ //this.waterMeterTransVolt = cdData.waterMeterTransVolt ;
+ //this.waterMeterWorkVolt = cdData.waterMeterWorkVolt ;
+ }
+
+ public void valueFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd84Vo cdData) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ //this.orderNo = cdData.orderNo ;
+ this.icCardAddr = cdData.cardAddr ;
+ this.icCardNo = cdData.cardNo ;
+ //this.waterLevel = cdData.waterLevel ;
+ //this.waterPress = cdData.waterPress ;
+ this.waterInstant = cdData.instantAmount ;
+ this.waterTotal = cdData.totalAmount ;
+ //this.eleTotal = cdData.eleTotal ;
+ this.moneyRemain = cdData.remainMoney ;
+ //this.waterRemain = cdData.waterRemain ;
+ //this.thisEle = cdData.thisEle ;
+ //this.thisWater = cdData.thisWater ;
+ //this.thisMoney = cdData.thisMoney ;
+ //this.thisDuration = cdData.thisDuration ;
+ //this.waterPrice = cdData.waterPrice ;
+ //this.elePrice = cdData.elePrice ;
+ //this.aVolt = cdData.aVolt ;
+ //this.bVolt = cdData.bVolt ;
+ //this.cVolt = cdData.cVolt ;
+ //this.aCurrent = cdData.aCurrent ;
+ //this.bCurrent = cdData.bCurrent ;
+ //this.cCurrent = cdData.cCurrent ;
+ //this.batteryVolt = cdData.batteryVolt ;
+ //this.waterMeterTransVolt = cdData.waterMeterTransVolt ;
+ //this.waterMeterWorkVolt = cdData.waterMeterWorkVolt ;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0