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


@@ -5,16 +5,13 @@


import com.baomidou.mybatisplus.annotation.IdType;


import com.baomidou.mybatisplus.annotation.TableId;


import com.baomidou.mybatisplus.annotation.TableName;


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.p206V1_0_0.upVos.DataCd97Vo;


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;


import com.dy.common.po.BaseEntity;


import com.dy.common.util.DateTime;


import com.dy.pipIrrGlobal.pojoPr.PrController;


import com.fasterxml.jackson.annotation.JsonFormat;


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


import lombok.*;


@@ -249,8 +246,21 @@


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


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


    }




    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;


@@ -263,8 +273,28 @@


    }






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


    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;


@@ -285,7 +315,7 @@




    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;


@@ -303,7 +333,7 @@


        this.clThisAmount = null;


        this.clThisMoney = null;


        this.clThisTime = null;


        this.clPrice = null;


        this.clPrice = cdData.price;


        this.clOpenDt = null;


        this.closeDt = null;




@@ -313,10 +343,11 @@


        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;


@@ -324,15 +355,15 @@


        this.clThisAmount = cdData.thisWater;


        this.clThisMoney = cdData.thisMoney;


        this.clThisTime = cdData.thisDuration;


        this.clPrice = null;


        this.clPrice = cdData.price;


        this.clOrderNo = cdData.orderNo;


        this.clEleTotalAmount = cdData.eleTotalAmount;


        this.clWaterRemainUser = cdData.waterRemain;


        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;


@@ -345,8 +376,23 @@


        }


    }




    public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, Boolean clearLastOpenValve) throws Exception {


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




    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.clearCloseValue();


        }


    }




    public void updateFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo dataCd83CloseVo, Boolean clearLastOpenValve) 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;


@@ -364,6 +410,68 @@


        }


    }






    public void updateFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo dataCd83CloseVo, Boolean clearLastOpenValve) 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(clearLastOpenValve != null && clearLastOpenValve.booleanValue()){


            this.clearOpenValue();


        }


    }






    public void updateFrom(DataV202404 dataV202404, DataCd84Vo cdData, Boolean clearLastCloseValve) throws Exception {


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


        this.opType = cdData.opType;


        this.opTotalAmount = cdData.waterTotalAmount;


        this.opIcCardNo = cdData.icCardNo;


        this.opIcCardAddr = cdData.icCardAddr;


        this.opRemainMoney = cdData.moneyRemainUser;


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


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


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


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




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


            this.clearCloseValue();


        }


    }






    public void updateFrom(DataV202404 dataV202404, DataCd85Vo cdData, Boolean clearLastOpenValve) 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 = cdData.price;


        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(clearLastOpenValve != null && clearLastOpenValve.booleanValue()){


            this.clearOpenValue();


        }


    }




    public void clearCloseValue(){


        this.clDt = null;


        this.clType = null;