Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

wuzeyu

2024-06-17 5c1a8a48f73591002189a99db030440208f056b5

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java

@@ -1,14 +1,11 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;

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.DataCdC0Vo;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

@@ -56,19 +53,19 @@
     * @param dataCdC0Vo 自报数据对象
     */
    private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
        RmAutoReportLast po = sv.getRmAutoReportLast(rtuAddr) ;
        if(po == null){
            po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(),
                    rtuAddr,
                    DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                    DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
                    dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
                    dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
            sv.saveRmAutoReportLast(po) ;
        }else{
            po = this.update(controller, po, dV1_0_1, dataCdC0Vo) ;
            sv.updateRmAutoReportLast(po);
        }
        //RmAutoReportLast po = sv.getRmAutoReportLast(rtuAddr) ;
        //if(po == null){
        //    po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(),
        //            rtuAddr,
        //            DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
        //            DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
        //            dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
        //            dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
        //    sv.saveRmAutoReportLast(po) ;
        //}else{
        //    po = this.update(controller, po, dV1_0_1, dataCdC0Vo) ;
        //    sv.updateRmAutoReportLast(po);
        //}
    }

    /**
@@ -78,31 +75,31 @@
     * @param rtuAddr 控制器地址
     * @param dataCdC0Vo 自报数据对象
     */
    private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
        RmAutoReportHistory po = new RmAutoReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
                dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
                dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
        sv.saveRmAutoReportHistory(po) ;
    }
    //private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
    //    RmAutoReportHistory po = new RmAutoReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
    //            rtuAddr,
    //            DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
    //            DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
    //            dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
    //            dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
    //    sv.saveRmAutoReportHistory(po) ;
    //}


    private RmAutoReportLast update(PrController controller, RmAutoReportLast po, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
        po.controllerid = controller==null?null:controller.getId();
        po.intakeid = controller==null?null:controller.getIntakeId();

        po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
        po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
        po.instantamount = dataCdC0Vo.instantAmount;
        po.totalamount = dataCdC0Vo.totalAmount;
        po.lossamount = dataCdC0Vo.lossAmount;
        po.waterpress = dataCdC0Vo.waterPress;
        po.batteryvolt = dataCdC0Vo.batteryVolt;
        po.sunvolt = dataCdC0Vo.sunVolt;
        po.signalvalue = dataCdC0Vo.signalValue;
        return po ;
    }
    //private RmAutoReportLast update(PrController controller, RmAutoReportLast po, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
    //    po.controllerid = controller==null?null:controller.getId();
    //    po.intakeid = controller==null?null:controller.getIntakeId();
    //
    //    po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
    //    po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
    //    po.instantamount = dataCdC0Vo.instantAmount;
    //    po.totalamount = dataCdC0Vo.totalAmount;
    //    po.lossamount = dataCdC0Vo.lossAmount;
    //    po.waterpress = dataCdC0Vo.waterPress;
    //    po.batteryvolt = dataCdC0Vo.batteryVolt;
    //    po.sunvolt = dataCdC0Vo.sunVolt;
    //    po.signalvalue = dataCdC0Vo.signalValue;
    //    return po ;
    //}
}