From c60767599cf741fde1cb7a10544d8c0ebb8db6a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:33 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定月份各天漏算了、统计指定年份各月漏算量

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java |   61 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
index 3c19a46..c897110 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
@@ -1,6 +1,15 @@
 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.*;
 
@@ -23,82 +32,102 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(name = "瀹氭椂鎶ュ巻鍙叉暟鎹〃")
-public class RmTimingReportHistory {
+public class RmTimingReportHistory implements BaseEntity {
     public static final long serialVersionUID = 202406111447001L;
 
     /**
     * 涓婚敭
     */
-    private Long id;
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    public Long id;
 
     /**
     * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
     */
-    private Long controllerId;
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long controllerId;
 
     /**
     * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
     */
-    private Long intakeId;
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long intakeId;
 
     /**
     * 鎺у埗鍣ㄥ湴鍧�
     */
-    private String rtuAddr;
+    public String rtuAddr;
 
     /**
     * 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
     */
-    private Date dt;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date dt;
 
     /**
     * 鎺у埗鍣ㄦ椂閽�
     */
-    private Date rtuDt;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date rtuDt;
 
     /**
     * 鏁版嵁鏃堕棿
     */
-    private Date dataDt;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date dataDt;
 
     /**
     * 鏈勾绱娴侀噺
     */
-    private Double waterTotalAmountYear;
+    public Double waterTotalAmountYear;
 
     /**
     * 姘磋〃绱娴侀噺
     */
-    private Double waterTotalAmountMeter;
+    public Double waterTotalAmountMeter;
 
     /**
     * 鏈勾绱鐢甸噺
     */
-    private Double eleTotalAmountYear;
+    public Double eleTotalAmountYear;
 
     /**
     * 鐢佃〃绱鐢甸噺
     */
-    private Double eleTotalAmountMeter;
+    public Double eleTotalAmountMeter;
 
     /**
     * 褰撴棩姘磋〃鍑�娴侀噺
     */
-    private Double waterTotalAmountDay;
+    public Double waterTotalAmountDay;
 
     /**
     * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
     */
-    private Double waterUserTotalAmountDay;
+    public Double waterUserTotalAmountDay;
 
     /**
     * 婕忔崯姘撮噺
     */
-    private Double lossTotalAmountDay;
+    public Double lossTotalAmountDay;
 
     /**
     * 鍚庡鐢垫睜鐢靛帇
     */
-    private Double batteryVolt;
+    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