1、靳总协议解析与构造修改完善; 2、靳总协议上行数据处理修改完善; 3、增加UserTokenFilter非过滤（放行）URL功能实现。

liurunyu

2024-07-01 a27fab527ce7d4aa8c9c8f0645cb8c2520590407

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

@@ -67,6 +67,7 @@
            //数据库中存在该控制器的开关阀数据
            if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt).equals(poLast.openDt)){
                //时间一致，重复上报数据，不进行任何处理
                //log.error("测试开阀日期一致");
            }else{
                if(poLast.opType != null){
                    //原记录存在开阀数据，首先进行时间对比
@@ -149,16 +150,11 @@
     * @throws Exception
     */
    private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
        RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83OpenVo.type,
                dataCd83OpenVo.totalAmount,
                dataCd83OpenVo.icCardNo,
                dataCd83OpenVo.icCardAddr,
                dataCd83OpenVo.remainMoney,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt),
                null, null, null, null, null, null, null, null, null, null, null) ;
        RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
        po.valueFrom(dV1_0_1, dataCd83OpenVo);
        return po ;
    }

@@ -173,16 +169,11 @@
     * @throws Exception
     */
    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83OpenVo.type,
                dataCd83OpenVo.totalAmount,
                dataCd83OpenVo.icCardNo,
                dataCd83OpenVo.icCardAddr,
                dataCd83OpenVo.remainMoney,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt),
                null, null, null, null, null, null, null, null, null, null, null) ;
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
        po.valueFrom(dV1_0_1, dataCd83OpenVo);
        return po ;
    }

@@ -200,56 +191,12 @@
    private void updateOpenValve(PrController controller, RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
        poLast.controllerId = controller==null?null:controller.getId();
        poLast.intakeId = controller==null?null:controller.getIntakeId();

        poLast.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
        poLast.opType = dataCd83OpenVo.type ;
        poLast.opTotalAmount = dataCd83OpenVo.totalAmount ;
        poLast.opIcCardNo = dataCd83OpenVo.icCardNo ;
        poLast.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
        poLast.opRemainMoney = dataCd83OpenVo.remainMoney ;
        poLast.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
        poLast.updateFrom(dV1_0_1, dataCd83OpenVo, clearCloseValve);

        if(poHistory != null){
            poHistory.controllerId = controller==null?null:controller.getId();
            poHistory.intakeId = controller==null?null:controller.getIntakeId();

            poHistory.opDt = poLast.opDt;
            poHistory.opType = dataCd83OpenVo.type ;
            poHistory.opTotalAmount = dataCd83OpenVo.totalAmount ;
            poHistory.opIcCardNo = dataCd83OpenVo.icCardNo ;
            poHistory.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
            poHistory.opRemainMoney = dataCd83OpenVo.remainMoney ;
            poHistory.openDt = poLast.openDt ;
            poHistory.updateFrom(dV1_0_1, dataCd83OpenVo, clearCloseValve);
        }

        if(clearCloseValve){
            poLast.clDt = null ;
            poLast.clType = null ;
            poLast.clTotalAmount = null ;
            poLast.clIcCardNo = null ;
            poLast.clIcCardAddr = null ;
            poLast.clRemainMoney = null ;
            poLast.clThisAmount = null ;
            poLast.clThisMoney = null ;
            poLast.clThisTime = null ;
            poLast.clOpenDt = null ;
            poLast.closeDt = null ;

            if(poHistory != null) {
                poHistory.clDt = null;
                poHistory.clType = null;
                poHistory.clTotalAmount = null;
                poHistory.clIcCardNo = null;
                poHistory.clIcCardAddr = null;
                poHistory.clRemainMoney = null;
                poHistory.clThisAmount = null;
                poHistory.clThisMoney = null;
                poHistory.clThisTime = null;
                poHistory.clOpenDt = null;
                poHistory.closeDt = null;
            }

        }

    }
}