Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-23 bebea951bb2aa3f1101da97387c21f03650aa332

 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,110 @@
@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;

    /**
    * 控制器实体ID（外键）
    */
    private Long controllerId;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long controllerId;

    /**
    * 取水口实体ID（外键）
    */
    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;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double waterTotalAmountYear;

    /**
    * 水表累计流量
    */
    private Double waterTotalAmountMeter;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double waterTotalAmountMeter;

    /**
    * 本年累计电量
    */
    private Double eleTotalAmountYear;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double eleTotalAmountYear;

    /**
    * 电表累计电量
    */
    private Double eleTotalAmountMeter;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double eleTotalAmountMeter;

    /**
    * 当日水表净流量
    */
    private Double waterTotalAmountDay;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double waterTotalAmountDay;

    /**
    * 当日用户用水量
    */
    private Double waterUserTotalAmountDay;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double waterUserTotalAmountDay;

    /**
    * 漏损水量
    */
    private Double lossTotalAmountDay;
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double lossTotalAmountDay;

    /**
    * 后备电池电压
    */
    private Double batteryVolt;
    @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 ;// 后备电池电压
    }
}