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

zhubaomin

2024-11-12 39be193dece5ad6314aa22a41a2c8675e8057be3

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java

@@ -12,6 +12,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Date;

/**
 * @Author liurunyu
 * @Date 2024/5/8 14:18
@@ -82,7 +84,7 @@
                                  String rtuDt,
                                  AlarmVo alarmVo,
                                  String receiveDt) throws Exception {
        RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
        RmAlarmStateLast po = sv.getRmAlarmStateLast(controller.getIntakeId()) ;
        if(po == null){
            po = new RmAlarmStateLast(null,
                    controller==null?null:controller.getId(),
@@ -107,7 +109,8 @@
                    alarmVo==null?null:alarmVo.stateIcEnable,
                    (byte)0,//电池电压(1：报警，0：正常)
                    (byte)0,//阀门报警(1：报警，0：正常)
                    (byte)0//供电方式（0: 220V，1：蓄电池）
                    (byte)0,//供电方式（0: 220V，1：蓄电池）
                    System.currentTimeMillis()
            ) ;
            sv.saveRmAlarmStateLast(po) ;
        }else{
@@ -210,7 +213,8 @@
                //阀门关闭状态
                if(controller != null && controller.getIntakeId() != null){
                    //虚拟卡在取水中的占用状态改为非应用状态
                    sv.updateVirCardNoUseState(controller.getIntakeId());
                    Date now = new Date() ;
                    sv.updateVirCardNoUseState(controller.getIntakeId(), now);
                }
            }
        }