1、表阀一体机协议开阀类型变化； 2、表阀一体机协议开关阀报中增加水价数据；

liurunyu

4 天以前 d8eb22351c6d0bfe0c9f233edfd593538e6838c9

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java

New file
@@ -0,0 +1,110 @@
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @Author: liurunyu
 * @Date: 2025/2/5 9:36
 * @Description
 */
@Data
@JsonPropertyOrder({ "intakeId", "clientId",
        "clientName", "clientAddr",
        "openTime" , "openType" ,
        "openIcNum" , "openRemainMoney" ,
        "closeTime" , "closeType" ,
        "closeIcNum" , "closeRemainMoney" ,
        "thisTime" , "thisAmount" ,
        "thisMoney"  })
public class VoArIntakeOpenCloseValve {
    public static final long serialVersionUID = 202502050936001L;

    /**
     * 取水口ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long intakeId;

    /**
     * 开关阀农户ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long clientId;

    /**
     * 开关阀农户
     */
    public String clientName;

    /**
     * 农户地址
     */
    public String clientAddr;


    /**
     * 开阀日期时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    public Date openTime ;

    /**
     * 开阀类型
     */
    @JSONField(serialize=false)
    public Byte opType;
    public String openType;

    /**
     * 开阀IC卡编号
     */
    public String openIcNum;

    /**
     * 开阀时卡内剩余金额
     */
    public Double openRemainMoney;


    /**
     * 关阀日期时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    public Date closeTime ;

    /**
     * 关阀类型
     */
    @JSONField(serialize=false)
    public Byte clType;
    public String closeType;

    /**
     * 关阀IC卡编号
     */
    public String closeIcNum;

    /**
     * 关阀时卡内剩余金额
     */
    public Double closeRemainMoney;

    /**
     * 本次用水时长（分钟）
     */
    public Integer thisTime;
    /**
     * 本次用水量
     */
    public Double thisAmount;
    /**
     * 本次消费金额
     */
    public Double thisMoney;
}