元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
2024-10-28 1f46976c9ee72d7889fceee968db9c8aef885eca 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java


@@ -1,6 +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.DataCd83CloseVo;


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


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


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


@@ -16,8 +17,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 +47,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（外键）


     */


@@ -184,6 +197,12 @@


    public Integer clThisTime;




    /**


     * 关阀报中水价


     */


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


    public Double clPrice ;//水价




    /**


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


     */


    @Schema(description = "关阀报中的开阀时控制器时钟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)


@@ -213,7 +232,7 @@


    /**


     * 本次使用电量


     */


    public Double thisEle;


    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);


@@ -235,13 +254,34 @@


        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(DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo) throws Exception {


        this.clDt =  DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.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 {


@@ -264,13 +304,14 @@


        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 {


@@ -284,13 +325,14 @@


        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 {


    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);


        this.opType = dataCd83OpenVo.type;


        this.opTotalAmount = dataCd83OpenVo.totalAmount;


@@ -298,7 +340,7 @@


        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 +350,45 @@


            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_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.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;//江海协议特有


        }


    }


}