Administrator
2024-07-02 2e930e8e96bca4159538ba84fae1c62880134e5c
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.Data;
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.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
@@ -141,21 +140,22 @@
     * @throws Exception
     */
    private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                null, null, null, null, null, null,null,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83CloseVo.type,
                dataCd83CloseVo.totalAmount,
                dataCd83CloseVo.icCardNo,
                dataCd83CloseVo.icCardAddr,
                dataCd83CloseVo.remainMoney,
                dataCd83CloseVo.thisAmount,
                dataCd83CloseVo.thisMoney,
                dataCd83CloseVo.thisTime,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        return po ;
        //RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
        //        rtuAddr,
        //        null, null, null, null, null, null,null,
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
        //        dataCd83CloseVo.type,
        //        dataCd83CloseVo.totalAmount,
        //        dataCd83CloseVo.icCardNo,
        //        dataCd83CloseVo.icCardAddr,
        //        dataCd83CloseVo.remainMoney,
        //        dataCd83CloseVo.thisAmount,
        //        dataCd83CloseVo.thisMoney,
        //        dataCd83CloseVo.thisTime,
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        //return po ;
        return null;
    }
@@ -169,21 +169,22 @@
     * @throws Exception
     */
    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                null, null, null, null, null, null,null,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83CloseVo.type,
                dataCd83CloseVo.totalAmount,
                dataCd83CloseVo.icCardNo,
                dataCd83CloseVo.icCardAddr,
                dataCd83CloseVo.remainMoney,
                dataCd83CloseVo.thisAmount,
                dataCd83CloseVo.thisMoney,
                dataCd83CloseVo.thisTime,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        return po ;
        //RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
        //        rtuAddr,
        //        null, null, null, null, null, null,null,
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
        //        dataCd83CloseVo.type,
        //        dataCd83CloseVo.totalAmount,
        //        dataCd83CloseVo.icCardNo,
        //        dataCd83CloseVo.icCardAddr,
        //        dataCd83CloseVo.remainMoney,
        //        dataCd83CloseVo.thisAmount,
        //        dataCd83CloseVo.thisMoney,
        //        dataCd83CloseVo.thisTime,
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
        //        DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        //return po ;
        return null;
    }