元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
5 天以前 e8937f27fce194d015ce6c27d286e7fc89f5e580 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java


@@ -1,7 +1,7 @@


package com.dy.pipIrrGlobal.pojoRm;




import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;


import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;


import com.dy.common.mw.protocol.p206V1.DataV1;


import com.dy.common.mw.protocol.p206V2.DataV2;


import com.dy.common.mw.protocol.p206V202404.DataV202404;


import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo;


import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;


@@ -16,8 +16,6 @@


import com.fasterxml.jackson.annotation.JsonFormat;


import io.swagger.v3.oas.annotations.media.Schema;


import lombok.*;




import java.util.Date;




/**


 * @Author: liurunyu


@@ -48,6 +46,20 @@


    @JSONField(serializeUsing= ObjectWriterImplToString.class)


    @TableId(type = IdType.INPUT)


    public Long id;




    /**


     * 农户实体ID（外键）


     */


    @Schema(description = "农户实体外键", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JSONField(serializeUsing= ObjectWriterImplToString.class)


    public Long clientId;




    /**


     * 农户姓名


     */


    @Schema(description = "农户姓名", requiredMode = Schema.RequiredMode.REQUIRED)


    public String clientName;




    /**


     * 控制器实体ID（外键）


     */


@@ -85,6 +97,7 @@


     * 开阀时累计流量


     */


    @Schema(description = "开阀时累计流量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double opTotalAmount;




    /**


@@ -103,6 +116,7 @@


     * 开阀时剩余金额


     */


    @Schema(description = "开阀时剩余金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double opRemainMoney;




    /**


@@ -115,12 +129,14 @@


     * 开阀时电表累计电量


     */


    @Schema(description = "开阀时电表累计电量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double opEleTotalAmount;




    /**


     * 开阀时用水户剩余水量


     */


    @Schema(description = "开阀时用水户剩余水量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double opWaterRemainUser;




    /**


@@ -145,6 +161,7 @@


     * 关阀时累计流量


     */


    @Schema(description = "关阀时累计流量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clTotalAmount;




    /**


@@ -163,18 +180,21 @@


     * 关阀时剩余金额


     */


    @Schema(description = "关阀时剩余金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clRemainMoney;




    /**


     * 关阀报中本次用水量


     */


    @Schema(description = "关阀时本次用水量", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clThisAmount;




    /**


     * 关阀报中本次消费金额


     */


    @Schema(description = "关阀时本次消费金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clThisMoney;




    /**


@@ -182,6 +202,13 @@


     */


    @Schema(description = "关阀时本次用水时长（分钟）", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    public Integer clThisTime;




    /**


     * 关阀报中水价


     */


    @Schema(description = "关阀报中水价", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clPrice ;//水价




    /**


     * 关阀报中的开阀时控制器时钟


@@ -203,20 +230,23 @@


    /**


     * 电表累计电量


     */


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clEleTotalAmount;




    /**


     * 用户剩余水量


     */


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clWaterRemainUser;




    /**


     * 本次使用电量


     */


    public Double thisEle;


    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )


    public Double clThisEle;




    public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);


    public void valueFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo dataCd83OpenVo) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);


        this.opType = dataCd83OpenVo.type;


        this.opTotalAmount = dataCd83OpenVo.totalAmount;


        this.opIcCardNo = dataCd83OpenVo.icCardNo;


@@ -235,18 +265,89 @@


        this.clThisAmount = null;


        this.clThisMoney = null;


        this.clThisTime = null;


        this.clPrice = null;


        this.clOpenDt = null;


        this.closeDt = null;




        this.clOrderNo = null;//江海协议特有


        this.clEleTotalAmount = null;//江海协议特有


        this.clWaterRemainUser = null;//江海协议特有


        this.thisEle = null;//江海协议特有


        this.clThisEle = null;//江海协议特有


    }




    public void valueFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd83OpenVo dataCd83OpenVo) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);


        this.opType = dataCd83OpenVo.type;


        this.opTotalAmount = dataCd83OpenVo.totalAmount;


        this.opIcCardNo = dataCd83OpenVo.icCardNo;


        this.opIcCardAddr = dataCd83OpenVo.icCardAddr;


        this.opRemainMoney = dataCd83OpenVo.remainMoney;


        this.opOrderNo = null; //江海协议特有


        this.opEleTotalAmount = null; //江海协议特有


        this.opWaterRemainUser = null; //江海协议特有


        this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);


        this.clDt = null;


        this.clType = null;


        this.clTotalAmount = null;


        this.clIcCardNo = null;


        this.clIcCardAddr = null;


        this.clRemainMoney = null;


        this.clThisAmount = null;


        this.clThisMoney = null;


        this.clThisTime = null;


        this.clPrice = null;


        this.clOpenDt = null;


        this.closeDt = null;




        this.clOrderNo = null;//江海协议特有


        this.clEleTotalAmount = null;//江海协议特有


        this.clWaterRemainUser = null;//江海协议特有


        this.clThisEle = null;//江海协议特有


    }




    public void valueFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo dataCd83CloseVo) throws Exception {


        this.clDt =  DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);


        this.clType = dataCd83CloseVo.type;


        this.clTotalAmount = dataCd83CloseVo.totalAmount;


        this.clIcCardNo = dataCd83CloseVo.icCardNo;


        this.clIcCardAddr = dataCd83CloseVo.icCardAddr;


        this.clRemainMoney = dataCd83CloseVo.remainMoney;


        this.clThisAmount = dataCd83CloseVo.thisAmount;


        this.clThisMoney = dataCd83CloseVo.thisMoney;


        this.clThisTime = dataCd83CloseVo.thisTime;


        this.clPrice = dataCd83CloseVo.price;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);




        this.clOrderNo = null;//江海协议特有


        this.clEleTotalAmount = null;//江海协议特有


        this.clWaterRemainUser = null;//江海协议特有


        this.clThisEle = null;//江海协议特有


    }




    public void valueFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo dataCd83CloseVo) throws Exception {


        this.clDt =  DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);


        this.clType = dataCd83CloseVo.type;


        this.clTotalAmount = dataCd83CloseVo.totalAmount;


        this.clIcCardNo = dataCd83CloseVo.icCardNo;


        this.clIcCardAddr = dataCd83CloseVo.icCardAddr;


        this.clRemainMoney = dataCd83CloseVo.remainMoney;


        this.clThisAmount = dataCd83CloseVo.thisAmount;


        this.clThisMoney = dataCd83CloseVo.thisMoney;


        this.clThisTime = dataCd83CloseVo.thisTime;


        this.clPrice = dataCd83CloseVo.price;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);




        this.clOrderNo = null;//江海协议特有


        this.clEleTotalAmount = null;//江海协议特有


        this.clWaterRemainUser = null;//江海协议特有


        this.clThisEle = null;//江海协议特有


    }




    public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.opType = null;


        this.opType = cdData.opType;


        this.opTotalAmount = cdData.waterTotalAmount;


        this.opIcCardNo = cdData.icCardNo;


        this.opIcCardAddr = cdData.icCardAddr;


@@ -264,19 +365,20 @@


        this.clThisAmount = null;


        this.clThisMoney = null;


        this.clThisTime = null;


        this.clPrice = null;


        this.clOpenDt = null;


        this.closeDt = null;




        this.clOrderNo = null;//江海协议特有


        this.clEleTotalAmount = null;//江海协议特有


        this.clWaterRemainUser = null;//江海协议特有


        this.thisEle = null;//江海协议特有


        this.clThisEle = null;//江海协议特有


    }




    public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);


        this.opType = cdData.opType;


        this.clType = cdData.clType;


        this.clIcCardAddr = cdData.icCardAddr;


        this.clIcCardNo = cdData.icCardNo;


        this.clTotalAmount = cdData.waterTotalAmount;


@@ -284,21 +386,22 @@


        this.clThisAmount = cdData.thisWater;


        this.clThisMoney = cdData.thisMoney;


        this.clThisTime = cdData.thisDuration;


        this.clPrice = null;


        this.clOrderNo = cdData.orderNo;


        this.clEleTotalAmount = cdData.eleTotalAmount;


        this.clWaterRemainUser = cdData.waterRemain;


        this.thisEle = cdData.thisEle;


        this.clThisEle = cdData.thisEle;


    }




    public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);


    public void updateFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo dataCd83OpenVo, Boolean clearCloseValve) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);


        this.opType = dataCd83OpenVo.type;


        this.opTotalAmount = dataCd83OpenVo.totalAmount;


        this.opIcCardNo = dataCd83OpenVo.icCardNo;


        this.opIcCardAddr = dataCd83OpenVo.icCardAddr;


        this.opRemainMoney = dataCd83OpenVo.remainMoney;


        this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);


        if (clearCloseValve) {


        if (clearCloseValve != null && clearCloseValve.booleanValue()) {


            this.clDt = null;


            this.clType = null;


            this.clTotalAmount = null;


@@ -308,8 +411,168 @@


            this.clThisAmount = null;


            this.clThisMoney = null;


            this.clThisTime = null;


            this.clPrice = null;


            this.clOpenDt = null;


            this.closeDt = null;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }




    public void updateFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd83OpenVo dataCd83OpenVo, Boolean clearCloseValve) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);


        this.opType = dataCd83OpenVo.type;


        this.opTotalAmount = dataCd83OpenVo.totalAmount;


        this.opIcCardNo = dataCd83OpenVo.icCardNo;


        this.opIcCardAddr = dataCd83OpenVo.icCardAddr;


        this.opRemainMoney = dataCd83OpenVo.remainMoney;


        this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);


        if (clearCloseValve != null && clearCloseValve.booleanValue()) {


            this.clDt = null;


            this.clType = null;


            this.clTotalAmount = null;


            this.clIcCardNo = null;


            this.clIcCardAddr = null;


            this.clRemainMoney = null;


            this.clThisAmount = null;


            this.clThisMoney = null;


            this.clThisTime = null;


            this.clPrice = null;


            this.clOpenDt = null;


            this.closeDt = null;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }




    public void updateFrom(DataV202404 dataV202404, DataCd84Vo dataCd84Vo, Boolean clearCloseValve) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.opType = dataCd84Vo.opType;


        this.opTotalAmount = dataCd84Vo.waterTotalAmount;


        this.opIcCardNo = dataCd84Vo.icCardNo;


        this.opIcCardAddr = dataCd84Vo.icCardAddr;


        this.opRemainMoney = dataCd84Vo.moneyRemainUser;


        this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.openDt);


        if (clearCloseValve != null && clearCloseValve.booleanValue()) {


            this.clDt = null;


            this.clType = null;


            this.clTotalAmount = null;


            this.clIcCardNo = null;


            this.clIcCardAddr = null;


            this.clRemainMoney = null;


            this.clThisAmount = null;


            this.clThisMoney = null;


            this.clThisTime = null;


            this.clPrice = null;


            this.clOpenDt = null;


            this.closeDt = null;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }






    public void updateFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);


        this.clType = dataCd83CloseVo.type;


        this.clTotalAmount = dataCd83CloseVo.totalAmount;


        this.clIcCardNo = dataCd83CloseVo.icCardNo;


        this.clIcCardAddr = dataCd83CloseVo.icCardAddr;


        this.clRemainMoney = dataCd83CloseVo.remainMoney;


        this.clThisAmount = dataCd83CloseVo.thisAmount;


        this.clThisMoney = dataCd83CloseVo.thisMoney;


        this.clThisTime = dataCd83CloseVo.thisTime;


        this.clPrice = dataCd83CloseVo.price;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;




        if(clearOpenValve){


            this.opDt = null ;


            this.opType = null ;


            this.opTotalAmount = null ;


            this.opIcCardNo = null ;


            this.opIcCardAddr = null ;


            this.opRemainMoney = null ;


            this.openDt = null ;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }




    public void updateFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);


        this.clType = dataCd83CloseVo.type;


        this.clTotalAmount = dataCd83CloseVo.totalAmount;


        this.clIcCardNo = dataCd83CloseVo.icCardNo;


        this.clIcCardAddr = dataCd83CloseVo.icCardAddr;


        this.clRemainMoney = dataCd83CloseVo.remainMoney;


        this.clThisAmount = dataCd83CloseVo.thisAmount;


        this.clThisMoney = dataCd83CloseVo.thisMoney;


        this.clThisTime = dataCd83CloseVo.thisTime;


        this.clPrice = dataCd83CloseVo.price;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;




        if(clearOpenValve){


            this.opDt = null ;


            this.opType = null ;


            this.opTotalAmount = null ;


            this.opIcCardNo = null ;


            this.opIcCardAddr = null ;


            this.opRemainMoney = null ;


            this.openDt = null ;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }






    public void updateFrom(DataV202404 dataV202404, DataCd85Vo cdData, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.clType = cdData.clType;


        this.clTotalAmount = cdData.waterTotalAmount;


        this.clIcCardNo = cdData.icCardNo;


        this.clIcCardAddr = cdData.icCardAddr;


        this.clOrderNo = cdData.orderNo;


        this.clRemainMoney = cdData.moneyRemain;


        this.clEleTotalAmount = cdData.eleTotalAmount;


        this.clWaterRemainUser = cdData.waterRemain;


        this.clThisAmount = cdData.thisWater;


        this.clThisMoney = cdData.thisMoney;


        this.clThisTime = cdData.thisDuration;


        this.clThisEle = cdData.thisEle;


        this.clPrice = null;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt) ;




        if(clearOpenValve){


            this.opDt = null ;


            this.opType = null ;


            this.opTotalAmount = null ;


            this.opIcCardNo = null ;


            this.opIcCardAddr = null ;


            this.opRemainMoney = null ;


            this.openDt = null ;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }


}