zhubaomin
2024-10-31 bac51596a78abb6d9411b9ad2b7f49d6849af710
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -58,11 +58,11 @@
     * @param dataCdC0Vo 开阀上报数据对象
     */
    private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
        Date findDt = controller.getFindDt() ;//发现此控制器的日期与时间
        if(findDt != null){
            String findDtStr = DateTime.yyyy_MM_dd(findDt) ;
            if(findDtStr.equals(DateTime.yyyy_MM_dd())){
                //当天发现控制器,控制器计算的漏损量一定不正确,强制设置成0
        Date operateDt = controller.getOperateDt() ;//取水中上绑定此控制器的日期与时间
        if(operateDt != null){
            String operateDtStr = DateTime.yyyy_MM_dd(operateDt) ;
            if(operateDtStr.equals(DateTime.yyyy_MM_dd())){
                //当天发现(并绑定)控制器,控制器计算的漏损量一定不正确,强制设置成0
                dataCdC0Vo.lossAmount = 0.0 ;
            }
        }
@@ -98,7 +98,10 @@
                    sv.updateRmLossHistory(poHistory);
                }else if(DateTime.dateFrom_yyyy_MM_dd1(dV1_0_1.dt).after(poLast.dt)){
                    //新的日期
                    poLast = this.newRmLossLast(controller, rtuAddr, dV1_0_1, dataCdC0Vo);
                    poLast.lossAmount = dataCdC0Vo.lossAmount ;
                    poLast.dt = DateTime.dateFrom_yyyy_MM_dd1(dataCdC0Vo.rtuDt);
                    poLast.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
                    poLast.dtRtu = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
                    this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCdC0Vo, poLast);
                    sv.updateRmLossLast(poLast);
                }else{