From e8937f27fce194d015ce6c27d286e7fc89f5e580 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 17:29:47 +0800
Subject: [PATCH] 查询开关阀记录相关修改

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java |  142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 142 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java
new file mode 100644
index 0000000..98c0d3a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java
@@ -0,0 +1,142 @@
+package com.dy.pipIrrGlobal.pojoRm;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
+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.*;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-06-14 15:17
+ * @LastEditTime 2024-06-14 15:17
+ * @Description
+ */
+/**
+ * 瀹氭椂鎶ユ渶鏂版暟鎹〃
+ */
+
+@TableName(value="rm_timing_report_last", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "瀹氭椂鎶ユ渶鏂版暟鎹〃")
+public class RmTimingReportLast implements BaseEntity {
+    public static final long serialVersionUID = 202406111519001L;
+
+    /**
+    * 涓婚敭
+    */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    public Long id;
+
+    /**
+    * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+    */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long controllerId;
+
+    /**
+    * 鍙栨按鍙e疄浣揑D锛堝閿級
+    */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long intakeId;
+
+    /**
+    * 鎺у埗鍣ㄥ湴鍧�
+    */
+    public String rtuAddr;
+
+    /**
+    * 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date dt;
+
+    /**
+    * 鎺у埗鍣ㄦ椂閽�
+    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date rtuDt;
+
+    /**
+    * 鏁版嵁鏃堕棿
+    */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date dataDt;
+
+    /**
+    * 鏈勾绱娴侀噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double waterTotalAmountYear;
+
+    /**
+    * 姘磋〃绱娴侀噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double waterTotalAmountMeter;
+
+    /**
+    * 鏈勾绱鐢甸噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double eleTotalAmountYear;
+
+    /**
+    * 鐢佃〃绱鐢甸噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double eleTotalAmountMeter;
+
+    /**
+    * 褰撴棩姘磋〃鍑�娴侀噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double waterTotalAmountDay;
+
+    /**
+    * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double waterUserTotalAmountDay;
+
+    /**
+    * 婕忔崯姘撮噺
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double lossTotalAmountDay;
+
+    /**
+    * 鍚庡鐢垫睜鐢靛帇
+    */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    public Double batteryVolt;
+
+    public void valueFrom(DataV202404 dataV202404, DataCd83Vo 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.dataDt = DateTime.dateFrom_yyyy_MM_dd(cdData.dataDt) ; //
+        this.waterTotalAmountYear = cdData.waterTotalAmountYear; //鏈勾绱娴侀噺
+        this.waterTotalAmountMeter = cdData.waterTotalAmountMeter ;//姘磋〃绱娴侀噺
+        this.eleTotalAmountYear = cdData.eleTotalAmountYear ;// 鏈勾绱鐢甸噺
+        this.eleTotalAmountMeter = cdData.eleTotalAmountMeter ;// 鐢佃〃绱鐢甸噺
+        this.waterTotalAmountDay = cdData.waterTotalAmountDay ;// 褰撴棩姘磋〃鍑�娴侀噺
+        this.waterUserTotalAmountDay = cdData.waterUserTotalAmountDay ;//  褰撴棩鐢ㄦ埛鐢ㄦ按閲�
+        this.lossTotalAmountDay = cdData.lossTotalAmountDay ;//  婕忔崯姘撮噺
+        this.batteryVolt = cdData.batteryVolt ;// 鍚庡鐢垫睜鐢靛帇
+    }
+
+}
\ No newline at end of file

--
Gitblit v1.8.0