2024-06-18 朱宝民 优化开关阀逻辑

Administrator

2024-06-18 26d63d120e517624be6fcf70ae9620c3582a91dd

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java

@@ -1,380 +1,175 @@
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.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

import java.util.Date;

/**
 * @author ZhuBaoMin
 * @date 2024-06-17 11:28
 * @LastEditTime 2024-06-17 11:28
 * @Author liurunyu
 * @Date 2024/2/23 16:00
 * @LastEditTime 2024/2/23 16:00
 * @Description
 */

/**
 * 开关阀报最新数据表
 */
@TableName(value="rm_open_close_valve_last", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "控制器开关阀上报最新数据")
public class RmOpenCloseValveLast {

    public static final long serialVersionUID = 202402231602001L;
    /**
     * 主键
     */
    private Long id;
    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED)
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @TableId(type = IdType.INPUT)
    public Long id;

    /**
     * 由最新数据持有历史数据中的最新记录ID，以方便快速查询
     * json不序列化此属性，即不向前端页面发送及显示
     */
    @Schema(hidden=true)
    @JSONField(serialize = false)
    public Long lastHistoryId;

    /**
     * 控制器实体ID（外键）
     */
    private Long controllerId;
    @Schema(description = "控制器实体外键", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long controllerId;

    /**
     * 取水口实体ID（外键）
     */
    private Long intakeId;
    @Schema(description = "取水口实体外键", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long intakeId;

    /**
     * 控制器地址
     */
    private String rtuAddr;
    @Schema(description = "控制器地址", requiredMode = Schema.RequiredMode.REQUIRED)
    public String rtuAddr;

    /**
     * 开阀数据接收日期时间
     */
    private Date opDt;
    @Schema(description = "数据接收日期时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    public Date opDt;

    /**
     * 开阀控制器时钟
     * 开阀类型
     */
    private Date opRtuDt;
    @Schema(description = "开阀类型", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Byte opType;

    /**
     * IC卡地址（远程关闭时为0）
     * 开阀时累计流量
     */
    private String opIcCardAddr;
    @Schema(description = "开阀时累计流量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double opTotalAmount;

    /**
     * IC卡编号（17位数字）
     * 开阀IC卡编号
     */
    private String opIcCardNo;
    @Schema(description = "开阀IC卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public String opIcCardNo;

    /**
     * 开阀订单号（16位数字）
     * 开阀ic卡地址
     */
    private String opOrderNo;
    @Schema(description = "开阀ic卡地址", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public String opIcCardAddr;

    /**
     * 开泵/阀时间
     * 开阀时剩余金额
     */
    private Date openDt;
    @Schema(description = "开阀时剩余金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double opRemainMoney;

    /**
     * 开阀水表累计水量
     * 开阀时控制器时钟
     */
    private Double opWaterTotalAmount;
    @Schema(description = "开阀时控制器时钟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Date openDt;

    /**
     * 开阀电表累计电量
     * 关阀数据接收日期时间
     */
    private Double opEleTotalAmount;
    @Schema(description = "关阀数据接收日期时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Date clDt;

    /**
     * 开阀用户剩余金额
     * 关阀类型
     */
    private Double opMoneyRemainUser;
    @Schema(description = "关阀类型", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Byte clType;

    /**
     * 开阀用户剩余水量
     * 关阀时累计流量
     */
    private Double opWaterRemainUser;
    @Schema(description = "关阀时累计流量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double clTotalAmount;

    /**
     * 关泵/阀方式
     * 关阀时IC卡编号
     */
    private String opType;
    @Schema(description = "关阀时IC卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public String clIcCardNo;

    /**
     * 关阀IC卡地址（远程关闭时为0）
     * 关阀时IC卡地址
     */
    private String clIcCardAddr;
    @Schema(description = "关阀时IC卡地址", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public String clIcCardAddr;

    /**
     * 关阀IC卡编号（17位数字）
     * 关阀时剩余金额
     */
    private String clIcCardNo;
    @Schema(description = "关阀时剩余金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double clRemainMoney;

    /**
     * 关阀订单号（16位数字）
     * 关阀报中本次用水量
     */
    private String clOrderNo;
    @Schema(description = "关阀时本次用水量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double clThisAmount;

    /**
     * 开始时间(分时日月)
     * 关阀报中本次消费金额
     */
    private Date startDt;
    @Schema(description = "关阀时本次消费金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Double clThisMoney;

    /**
     * 结束时间(分时日月)
     * 关阀报中本次用水时长（分钟）
     */
    private Date endDt;
    @Schema(description = "关阀时本次用水时长（分钟）", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Integer clThisTime;

    /**
     * 水表累计流量
     * 关阀报中的开阀时控制器时钟
     */
    private Double clWaterTotalAmount;
    @Schema(description = "关阀报中的开阀时控制器时钟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Date clOpenDt;

    /**
     * 电表累计电量
     * 关阀时控制器时钟
     */
    private Double clEleTotalAmount;
    @Schema(description = "关阀时控制器时钟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Date closeDt;

    /**
     * 用户剩余金额
     */
    private Double clMoneyRemainUser;

    /**
     * 用户剩余水量
     */
    private Double clWaterRemainUser;

    /**
     * 本次使用电量
     */
    private Double thisEle;

    /**
     * 本次使用水量
     */
    private Double thisWater;

    /**
     * 本次使用金额
     */
    private Double thisMoney;

    /**
     * 本次使用时间长
     */
    private Integer thisDuration;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getControllerId() {
        return controllerId;
    }

    public void setControllerId(Long controllerId) {
        this.controllerId = controllerId;
    }

    public Long getIntakeId() {
        return intakeId;
    }

    public void setIntakeId(Long intakeId) {
        this.intakeId = intakeId;
    }

    public String getRtuAddr() {
        return rtuAddr;
    }

    public void setRtuAddr(String rtuAddr) {
        this.rtuAddr = rtuAddr;
    }

    public Date getOpDt() {
        return opDt;
    }

    public void setOpDt(Date opDt) {
        this.opDt = opDt;
    }

    public Date getOpRtuDt() {
        return opRtuDt;
    }

    public void setOpRtuDt(Date opRtuDt) {
        this.opRtuDt = opRtuDt;
    }

    public String getOpIcCardAddr() {
        return opIcCardAddr;
    }

    public void setOpIcCardAddr(String opIcCardAddr) {
        this.opIcCardAddr = opIcCardAddr;
    }

    public String getOpIcCardNo() {
        return opIcCardNo;
    }

    public void setOpIcCardNo(String opIcCardNo) {
        this.opIcCardNo = opIcCardNo;
    }

    public String getOpOrderNo() {
        return opOrderNo;
    }

    public void setOpOrderNo(String opOrderNo) {
        this.opOrderNo = opOrderNo;
    }

    public Date getOpenDt() {
        return openDt;
    }

    public void setOpenDt(Date openDt) {
        this.openDt = openDt;
    }

    public Double getOpWaterTotalAmount() {
        return opWaterTotalAmount;
    }

    public void setOpWaterTotalAmount(Double opWaterTotalAmount) {
        this.opWaterTotalAmount = opWaterTotalAmount;
    }

    public Double getOpEleTotalAmount() {
        return opEleTotalAmount;
    }

    public void setOpEleTotalAmount(Double opEleTotalAmount) {
        this.opEleTotalAmount = opEleTotalAmount;
    }

    public Double getOpMoneyRemainUser() {
        return opMoneyRemainUser;
    }

    public void setOpMoneyRemainUser(Double opMoneyRemainUser) {
        this.opMoneyRemainUser = opMoneyRemainUser;
    }

    public Double getOpWaterRemainUser() {
        return opWaterRemainUser;
    }

    public void setOpWaterRemainUser(Double opWaterRemainUser) {
        this.opWaterRemainUser = opWaterRemainUser;
    }

    public String getOpType() {
        return opType;
    }

    public void setOpType(String opType) {
        this.opType = opType;
    }

    public String getClIcCardAddr() {
        return clIcCardAddr;
    }

    public void setClIcCardAddr(String clIcCardAddr) {
        this.clIcCardAddr = clIcCardAddr;
    }

    public String getClIcCardNo() {
        return clIcCardNo;
    }

    public void setClIcCardNo(String clIcCardNo) {
        this.clIcCardNo = clIcCardNo;
    }

    public String getClOrderNo() {
        return clOrderNo;
    }

    public void setClOrderNo(String clOrderNo) {
        this.clOrderNo = clOrderNo;
    }

    public Date getStartDt() {
        return startDt;
    }

    public void setStartDt(Date startDt) {
        this.startDt = startDt;
    }

    public Date getEndDt() {
        return endDt;
    }

    public void setEndDt(Date endDt) {
        this.endDt = endDt;
    }

    public Double getClWaterTotalAmount() {
        return clWaterTotalAmount;
    }

    public void setClWaterTotalAmount(Double clWaterTotalAmount) {
        this.clWaterTotalAmount = clWaterTotalAmount;
    }

    public Double getClEleTotalAmount() {
        return clEleTotalAmount;
    }

    public void setClEleTotalAmount(Double clEleTotalAmount) {
        this.clEleTotalAmount = clEleTotalAmount;
    }

    public Double getClMoneyRemainUser() {
        return clMoneyRemainUser;
    }

    public void setClMoneyRemainUser(Double clMoneyRemainUser) {
        this.clMoneyRemainUser = clMoneyRemainUser;
    }

    public Double getClWaterRemainUser() {
        return clWaterRemainUser;
    }

    public void setClWaterRemainUser(Double clWaterRemainUser) {
        this.clWaterRemainUser = clWaterRemainUser;
    }

    public Double getThisEle() {
        return thisEle;
    }

    public void setThisEle(Double thisEle) {
        this.thisEle = thisEle;
    }

    public Double getThisWater() {
        return thisWater;
    }

    public void setThisWater(Double thisWater) {
        this.thisWater = thisWater;
    }

    public Double getThisMoney() {
        return thisMoney;
    }

    public void setThisMoney(Double thisMoney) {
        this.thisMoney = thisMoney;
    }

    public Integer getThisDuration() {
        return thisDuration;
    }

    public void setThisDuration(Integer thisDuration) {
        this.thisDuration = thisDuration;
    }
}